diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..5a6991232f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,7 @@
+[submodule "deps/spdlog"]
+ path = deps/spdlog
+ url = https://github.com/gabime/spdlog.git
+
+[submodule "deps/cxxopts"]
+ path = deps/cxxopts
+ url = https://github.com/jarro2783/cxxopts.git
diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml
index 730c16e8fd..aa5aeb5026 100644
--- a/.pipelines/ci/templates/build-powertoys-steps.yml
+++ b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -87,6 +87,7 @@ steps:
**\Microsoft.Plugin.Uri.UnitTests.dll
**\Wox.Test.dll
**\*Microsoft.PowerToys.Settings.UI.UnitTests.dll
+ **\UnitTest-ColorPickerUI.dll
!**\obj\**
# .NetFramework assemblies
- task: VSTest@2
diff --git a/NOTICE.md b/NOTICE.md
index 1cab6e6944..8a2354739d 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -152,3 +152,58 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+## PowerToy: Installer
+
+### spdlog
+**Source**: https://github.com/gabime/spdlog
+
+The MIT License (MIT)
+
+Copyright (c) 2016 Gabi Melman.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-- NOTE: Third party dependency used by this software --
+This software depends on the fmt lib (MIT License),
+and users must comply to its license: https://github.com/fmtlib/fmt/blob/master/LICENSE.rst
+
+
+### cxxopts
+**Source**: https://github.com/jarro2783
+
+Copyright (c) 2014 Jarryd Beck
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/PowerToys.sln b/PowerToys.sln
index ce3c636352..7b981633f2 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -135,11 +135,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager", "src\modu
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "imageresizer", "imageresizer", "{6C7F47CC-2151-44A3-A546-41C70025132C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageResizerUI", "src\modules\imageresizer\ui\ImageResizerUI.csproj", "{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUI", "src\modules\imageresizer\ui\ImageResizerUI.csproj", "{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageResizerExt", "src\modules\imageresizer\dll\ImageResizerExt.vcxproj", "{0B43679E-EDFA-4DA0-AD30-F4628B308B1B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageResizerUITest", "src\modules\imageresizer\tests\ImageResizerUITest.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUITest", "src\modules\imageresizer\tests\ImageResizerUITest.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerUI", "src\modules\keyboardmanager\ui\KeyboardManagerUI.vcxproj", "{EAF23649-EF6E-478B-980E-81FAD96CCA2A}"
EndProject
@@ -229,7 +229,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
src\tests\win-app-driver\packages.config = src\tests\win-app-driver\packages.config
EndProjectSection
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Lib", "src\core\Microsoft.PowerToys.Settings.UI.Lib\Microsoft.PowerToys.Settings.UI.Lib.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Library", "src\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj", "{B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interop", "src\common\interop\interop.vcxproj", "{F055103B-F80B-4D0C-BF48-057C55620033}"
EndProject
@@ -269,6 +269,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Calculator
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj", "{4FA206A5-F69F-4193-BF8F-F6EEB496734C}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest-ColorPickerUI", "src\modules\colorPicker\UnitTest-ColorPickerUI\UnitTest-ColorPickerUI.csproj", "{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logging", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -543,6 +547,14 @@ Global
{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Debug|x64.Build.0 = Debug|x64
{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|x64.ActiveCfg = Release|x64
{4FA206A5-F69F-4193-BF8F-F6EEB496734C}.Release|x64.Build.0 = Release|x64
+ {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Debug|x64.Build.0 = Debug|Any CPU
+ {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|x64.ActiveCfg = Release|x64
+ {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}.Release|x64.Build.0 = Release|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.ActiveCfg = Release|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -621,6 +633,8 @@ Global
{0F85E674-34AE-443D-954C-8321EB8B93B1} = {C3081D9A-1586-441A-B5F4-ED815B3719C1}
{632BBE62-5421-49EA-835A-7FFA4F499BD6} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
{4FA206A5-F69F-4193-BF8F-F6EEB496734C} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
+ {090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1} = {1D78B84B-CA39-406C-98F4-71F7EC266CC0}
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F} = {1AFB6476-670D-4E80-A464-657E01DFF482}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
diff --git a/deps/cxxopts b/deps/cxxopts
new file mode 160000
index 0000000000..12e496da3d
--- /dev/null
+++ b/deps/cxxopts
@@ -0,0 +1 @@
+Subproject commit 12e496da3d486b87fa9df43edea65232ed852510
diff --git a/deps/cxxopts.props b/deps/cxxopts.props
new file mode 100644
index 0000000000..bdd65e5537
--- /dev/null
+++ b/deps/cxxopts.props
@@ -0,0 +1,8 @@
+
+
+
+ $(MSBuildThisFileDirectory)cxxopts\include;%(AdditionalIncludeDirectories)
+
+
+
diff --git a/deps/restore_git_submodules.props b/deps/restore_git_submodules.props
new file mode 100644
index 0000000000..bb1ff60ca1
--- /dev/null
+++ b/deps/restore_git_submodules.props
@@ -0,0 +1,12 @@
+
+
+ true
+
+
+
+
\ No newline at end of file
diff --git a/deps/spdlog b/deps/spdlog
new file mode 160000
index 0000000000..cbe9448650
--- /dev/null
+++ b/deps/spdlog
@@ -0,0 +1 @@
+Subproject commit cbe9448650176797739dbab13961ef4c07f4290f
diff --git a/deps/spdlog.props b/deps/spdlog.props
new file mode 100644
index 0000000000..921cf9509a
--- /dev/null
+++ b/deps/spdlog.props
@@ -0,0 +1,9 @@
+
+
+
+ $(MSBuildThisFileDirectory)spdlog\include;%(AdditionalIncludeDirectories)
+ SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_COMPILED_LIB;%(PreprocessorDefinitions)
+
+
+
diff --git a/doc/devdocs/logging.md b/doc/devdocs/logging.md
new file mode 100644
index 0000000000..ba3a50dd2c
--- /dev/null
+++ b/doc/devdocs/logging.md
@@ -0,0 +1,9 @@
+# How to use
+
+We use the awesome [spdlog](https://github.com/gabime/spdlog) library for logging as a git submodule under the `deps` directory. To use it in your project, just include [spdlog.props](../../deps/spdlog.props) in a .vcxproj like this:
+
+```xml
+Ctrl+A to Ctrl+V to also trigger the remap from Ctrl+V to Alt+V on pressing Ctrl+A on the keyboard.
+- Get the remap table as per the the `activatedApp` argument (i.e. if it is empty, we get the global shortcut remap table and otherwise we get the corresponding app-specific shortcut remap table).
+- Iterate over the list of remaps in descending order of number of keys in the shortcut. This is required **for shortcut to key remaps** to ensure that if a user has both Ctrl+A and Ctrl+Shift+A remapped to some keys, and the user presses Ctrl+Shift+A , then we prefer the Ctrl+Shift+A remap. This logic would not be required if there were only shortcut to shortcut remaps, as they are invoked only on exact match.
+- If any shortcut was found to be invoked (from the first step), then we skip till we find the matching shortcut remap. If not we check if the modifiers of the original shortcut are pressed down. If they are, we check if the current key event is a key down event and it matches the action key of the original shortcut. For shortcut to shortcut and for disabling a shortcut [we have an additional step](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L208-L212) where we check if any other key is pressed apart from the original shortcut. This is required because for these two features we allow the remaps only if those exact keys are pressed. The method used for this is described in detail [here](keyboardmanagercommon.md#IsKeyboardStateClearExceptShortcut). If a win key was pressed, we store whether it was the left or the right one, in order to determine which key to set for remaps from/to the common Win key code which we added. This is so that pressing and releasing Left Win key results in that Win key getting modified and not the Right Win key.
+ - If the remap is to a key, we send a dummy key event followed by releasing the original shortcut's modifiers and setting the target key (or doing nothing if it is remapped to disable) and we suppress the event.
+ - If the remap is to a shortcut, if the modifiers in the original shortcut are present in the target, we only set the additional modifiers and the action key of the target. If it isn't, we send a dummy key event followed by releasing the modifiers which are not common, and setting the remaining ones in the target along with the action key.
+ - For both cases, we set the `isShortcutInvoked` flag to true, and set the `KeyboardManagerState.activatedApp` if it is an app-specific shortcut remap.
+- For the `isShortcutInvoked` is true scenario (i.e. the initial remap keydown section is done) there are several cases depending on the key pressed or released:
+ - [**Case 1:**](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L339-L430) If a modifier in the original shortcut is released, we need to reset back to the physical keys pressed.
+ - For remap to shortcut, we release the target action key if it is currently pressed, and depending on whether all the modifiers of the original shortcut are present in the target, we release the target modifiers that are not common, and set the remaining original shortcut modifiers except the one that was released. We do not need to send the original action key as that will get generate it's own key event if it is held down.
+ - For remap to key, we release the target key if it is pressed (and it is not remapped to Disable), and we set the original shortcut modifiers.
+ - For both the cases we send a dummy key event at the end, since we are setting modifiers without any other key after that, and we reset all the remap variables.
+ - [**Case 2:**](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L435-L461) If the original shortcut's action key is pressed again, we send the target shortcut's action key or the target key again (or for disable we just suppress the event).
+ - [**Case 3:**](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L463-L527) If the original shortcut's action key is released
+ - For remap to shortcut, we just release the target shortcut's action key
+ - For remap to disable, we suppress the event
+ - For remap to key, we check if any other keys are pressed apart from the target key. If not, we just release the target key. If there are, we reset back to the physical keys by releasing the target key and setting the original shortcut's modifiers along with a dummy key, and we reset all the remap variables. This behavior is different from remap to shortcut because if the action key is released while other keys are pressed the remap should be inactive, but such a state can't occur for shortcut to shortcut remaps since they happen only when the exact keys are pressed.
+ - [**Case 4:**](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L529-L551) If a modifier in the original shortcut is pressed, suppress the event
+ - [**Case 5:**](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L553-L732) If any other key is pressed
+ - For remap to shortcut, we need to reset back to physical keys as the shortcut remaps can't be pressed in combination with other keys. We release the target action key if it was pressed, and we release the modifier keys of the target shortcut that are not common and set the remaining ones in the original shortcut. We then send the original shortcut's action key if the target action key was found to be pressed, and we send the current key press at the end.
+ - For remap to key, if it is remapped to disable or if the target key is not found to be pressed, we reset to the physical keys, we set the original shortcut's modifiers and if is remap to Disable and the original shortcut's action key is physically pressed (this is checked by the `isOriginalActionKeyPressed` flag which we keep track of whenever the action key is pressed or released for remap to Disable), then we set the original shortcut's action key, followed by the current key press. If it is not remapped to disable and the target key is pressed, then we don't suppress the event as we allow shortcut to key remappings to be pressed along with other keys.
+ - For all the above cases, dummy key isn't required as we want the current key press to behave like a normal key.
+ - [**Case 6:**](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L733) If any other key is released, do not suppress the event as this event didn't appear with a corresponding key down event (such as an app sending a key up event) or we processed the key down and let it continue (for shortcut to key scenario).
+- All the remapped key events that we send above are sent with `KEYBOARDMANAGER_SHORTCUT_FLAG` on the `dwExtraInfo` field, except the usage of the current key press in Case 5, for which we don't send any extra info so that it is considered as a normal key event which may in turn invoke some other remap.
+
+**Note:** Shortcuts are considered valid if they have modifiers and an action key. The reason why we haven't supported key combinations of just modifiers (which is requested in this [issue](https://github.com/microsoft/PowerToys/issues/5670)) (like remapping Ctrl+Alt ) is because this would require more cases and handling as these remappings have to take place only on press and release and if there is no key pressed in between similar to what Start Menu does. The remapping would have to be invoked only for this specific sequence Ctrl key down, Alt key down, Alt key up, Ctrl key up (ordering between Ctrl and Alt can be swapped). If any other key is pressed in between it shouldn't be invoked, and since this logic requires tracking exact states instead of using GetAsyncKeyStates, this could cause false positives if a user is not running as admin.
+
+## HandleOSLevelShortcutRemapEvent
+[This method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L741-L752) is used for handling global shortcut to shortcut and shortcut to key remaps. The general logic is as follows:
+- Check if the `dwExtraInfo` field is set to `KEYBOARDMANAGER_SHORTCUT_FLAG`. This indicates that the key event was generated by the KBM shortcut remap method using `SendInput`. This ensures that we don't read events generated by the shortcut remap method, but we still read events which are generated by the key remap method.
+- Call `HandleShortcutRemapEvent` without the `activatedApp` argument so that global shortcut remapping takes place if it applies for the current key event.
+
+## HandleAppSpecificShortcutRemapEvent
+[This method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L754-L809) is used for handling app-specific shortcut to shortcut and shortcut to key remaps. The general logic is as follows:
+- Check if the `dwExtraInfo` field is set to `KEYBOARDMANAGER_SHORTCUT_FLAG`. This indicates that the key event was generated by the KBM shortcut remap method using `SendInput`. This ensures that we don't read events generated by the shortcut remap method, but we still read events which are generated by the key remap method.
+- Get the name of the process in the foreground. This is done using `GetCurrentApplication` which uses `GetForegroundWindow` to get the window handle and `get_process_path` from the common lib. This approach can fail for UWP apps in full screen, so for that scenario we use the `GetGUIThreadInfo` approach to find the correct window handle, and hence the correct process name. This method is described in more detail [here](keyboardmanagercommon.md#Foreground-app-detection)
+- By checking `KeyboardManagerState.GetActivatedApp` we check if an app-specific shortcut is currently invoked. If so, we consider this application to be the activated app. This is required because some shortcut remaps could cause the current app to lose focus and hence until the shortcut is completely released we should allow that remap to continue, otherwise the user could end up in a state where some keys do not get released. For example: remap Ctrl+A to Alt+Tab for Edge, when a user presses Ctrl+A the window loses focus as Alt+Tab gets executed.
+- If there is no app-specific shortcut currently invoked, we check if the foreground process is present in the list of app-specific remaps, either with or without the file extension and case insensitive. If it is, this is considered to be the activated app.
+- Call `HandleShortcutRemapEvent` with the `activatedApp` argument so that app-specific shortcut remapping takes place if it applies for the current key event.
+
+## HandleSingleKeyToggleToModEvent (Obsolete - Code from PoC which is commented out)
+[This method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L126-L176) was added to support a feature for converting the behavior of a key from behaving like a toggle (like Caps Lock/Num Lock) to a modifier (like Ctrl), such that when you hold Caps Lock it would behave as if Caps Lock was active, and when it was not pressed Caps Lock would be off. For Caps Lock this would be similar to behaving like Shift, but for Num Lock there is no existing key which can substitute for this. This was added while testing out remapping for the KBM PoC, but wasn't added as a feature since it wasn't a priority.
+
+## Tests
+In order to test the remapping logic, a mocked keyboard input handler had to be created because otherwise the tests would process and send actual key events. For this the [`InputInterface`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/InputInterface.h) was made, and in production code the methods are implemented using [`SendInput`](https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-sendinput) and [`GetAsyncKeyState`](https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-getasynckeystate). In addition to this, [`GetCurrentApplication`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L226-L268) had to be mocked so that app-specific remapping can be tested.
+
+### MockedInput
+The [`MockedInput`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/MockedInput.h) class uses a 256 size `bool` vector to store the key state for each key code. Identifying the foreground process is mocked by simply setting and getting a string value for the name of the current process.
+
+[To mock the `SendInput` method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/test/MockedInput.cpp#L10-L110), the steps for processing the input are as follows. This implementation is based on public documentation for SendInput and the behavior of key messages and keyboard hooks:
+- Iterate over all the inputs in the INPUT array argument
+- If the event is a key up event, then it is considered [`WM_SYSKEYUP`](https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-syskeyup) if Alt is held down, otherwise it is `WM_KEYUP`.
+- If the event is a key down event, then it is considered [`WM_SYSKEYDOWN`](https://docs.microsoft.com/en-us/windows/win32/inputdev/wm-syskeydown) if either Alt is held down or if it is F10, otherwise it is `WM_KEYDOWN`.
+- An optional function which can be set on the `MockedInput` handler can be used to test for the number of times a key event is received by the system with a particular condition using [`sendVirtualInputCallCondition`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/test/MockedInput.cpp#L48-L52).
+- The hook logic for a low level hook which returns 0 or 1 can be set on the `MockedInput` handler such that it behaves like a low level hook would behave with actual keyboard input. If the method returns 1, then the keyboard state is not updated, and if it returns 0 the corresponding key event is used to update the key state. This works in the recursive way as well similar to low level hooks, as `SendVirtualInput` can be called from within the hook, thus simulating identical behavior to calling `SendInput` in a low level hook (as soon as SendInput is called, the low level hook is called for the new input event, and only after those are processed it returns back to the current event, check this [blog](https://devblogs.microsoft.com/oldnewthing/20140213-00/?p=1773) for more details).
+- For updating the keyboard state, KEYUP messages result in the state for that key code being set to false, and KEYDOWN result in the state for that key code being set to true.
+- For modifiers the behavior is slightly different as if the key state of the L/R version is modified, it should also modify the common version, and if a common version is released, it should release both the L and R versions.
+
+### Tests for single key remaps and shortcut remaps
+Using the MockedInput handler, all the expected (and known) key scenarios that can occur for while pressing a [remapped key](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/SingleKeyRemappingTests.cpp) or [remapped shortcut](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/OSLevelShortcutRemappingTests.cpp) are tested. The foreground app behavior which is specific to app-specific shortcuts is tested [here](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/AppSpecificShortcutRemappingTests.cpp).
diff --git a/doc/devdocs/modules/keyboardmanager/keyboardmanager.md b/doc/devdocs/modules/keyboardmanager/keyboardmanager.md
new file mode 100644
index 0000000000..3dd5304eff
--- /dev/null
+++ b/doc/devdocs/modules/keyboardmanager/keyboardmanager.md
@@ -0,0 +1,199 @@
+# Keyboard Manager module
+This file contains the documentation for the KeyboardManager PowerToy module which is called by the runner.
+## Table of Contents:
+1. [Class members](#Class-members)
+2. [Enable/Disable](#Enable/disable)
+3. [Settings format](#Settings-format)
+4. [Loading settings](#Loading-settings)
+5. [Low level keyboard hook handler](#Low-level-keyboard-hook-handler)
+6. [Custom Action to launch KBM UI](#Custom-Action-to-launch-KBM-UI)
+7. [SendInput Special Scenarios](#SendInput-Special-Scenarios)
+ 1. [Extended keys](#Extended-keys)
+ 2. [Scan code](#Scan-code)
+8. [Special Scenarios](#Special-Scenarios)
+ 1. [Dummy key events](#Dummy-key-events)
+ 2. [Suppressing Num Lock in a keyboard hook](#Suppressing-Num-Lock-in-a-keyboard-hook)
+ 3. [Modifier-Caps Lock interaction on Japanese IME keyboards](#Modifier-Caps-Lock-interaction-on-Japanese-IME-keyboards)
+ 4. [UIPI Issues (not resolved)](#UIPI-Issues-(not-resolved))
+9. [Other remapping approaches](#Other-remapping-approaches)
+ 1. [Registry approach](#Registry-approach)
+ 2. [Driver approach](#Driver-approach)
+10. [Telemetry](#Telemetry)
+
+## Class members
+The `KeyboardManager` module has [3 main class members](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L54-L61):
+- A static pointer to the current object of `KeyboardManager`. This is required for using the `KeyboardManager` object in the low level keyboard hook handler as that method must be static. This is described in more detail in [this section](#Low-level-keyboard-hook-handler).
+- An object of type `Input`, which is used for all the operations that involving getting or setting keyboard states. This is wrapped in an object to allow testing the remapping methods.
+- An object of type `KeyboardManagerState`. This object contains all the data related to remappings and is also used in the sense of a View Model as it used to communicate common data that is shared between the KBM UI and the backend. This class is described in more detail [here](keyboardmanagercommon.md#keyboardmanagerstate).
+
+## Enable/Disable
+On enabling KBM, the low level keyboard hook is started, and it is unhooked on disable. This is done to allow users to manually restart KBM if some other application which registers a keyboard hook was launched after PowerToys, so that it can be brought back to the highest priority hook (as the last hook to be registered receives the input first as mentioned [here](https://docs.microsoft.com/en-us/windows/win32/winmsg/about-hooks#hook-procedures)).
+
+In addition to stopping the hook, any active KBM UI windows are also closed on disabling. This is done because the KBM UI uses the same keyboard hook for the Type button where you can type a key/shortcut, so if KBM is disabled the windows would not be completely functional.
+
+The enable/disable code can be found [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L301-L322)
+
+## Settings format
+KBM uses two sets of settings files.
+- The main `settings.json` is of the following format:
+
+ {
+ "properties":
+ {
+ "activeConfiguration":
+ {
+ "value":"default"
+ },
+ "keyboardConfigurations":
+ {
+ "value":["default"]
+ }
+ },
+ "name":"Keyboard Manager",
+ "version":"1"
+ }
+
+ - The `activeConfiguration` attribute stores the current remapping profile, while `keyboardConfigurations` stores all the profiles that the user has. This was added to avoid any future breaking changes for the [profiles feature](https://github.com/microsoft/PowerToys/issues/1881), which would allow users to switch between remappings
+- The profile format (`default.json`) is of the following format:
+
+ {
+ "remapKeys":
+ {
+ "inProcess":
+ [
+ {
+ "originalKeys":"91",
+ "newRemapKeys":"162;70"
+ },
+ {
+ "originalKeys":"92",
+ "newRemapKeys":"162;70"
+ }
+ ]
+ },
+ "remapShortcuts":
+ {
+ "global":
+ [
+ {
+ "originalKeys":"164;37",
+ "newRemapKeys":"162;65"
+ },
+ {
+ "originalKeys":"162;68",
+ "newRemapKeys":"91"
+ }
+ ],
+ "appSpecific":
+ [
+ {
+ "originalKeys":"91;162;65",
+ "newRemapKeys":"162;86",
+ "targetApp":"msedge"
+ }
+ ]
+ }
+ }
+
+ - `originalKeys` stores the key/shortcut which is to be pressed for the remap, and `newKeys` stores the key/shortcut which is to be executed.
+ - Both contain semi-colon separated virtual key codes. For `remapKeys`, `originalKeys` must have only one key code, whereas for `remapShortcuts` it must have atleast two key codes.
+ - `inProcess` sub-key was added in `remapKeys` because there was a possibility of adding the registry based remapping approach (used by [SharpKeys](https://github.com/randyrants/sharpkeys)), so that would be under a separate sub-key while `inProcess` would be for keyboard hook based remaps. This was deprioritized as there weren't enough requests for it.
+ - `remapShortcuts` is split into `global` and `appSpecific`, where `global` remaps would apply to all applications, whereas `appSpecific` would apply on when the `targetApp` is in focus. `targetApp` must be the process name of the app (with or without it's extension), e.g. `msedge` or `msedge.exe` for Microsoft Edge.
+
+## Loading settings
+KBM settings are loaded only on the C++ side only at start up, in the [constructor](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L67-L68). The settings file may get modified from the KBM UI on applying new remappings, but the the file is not read again. The files are read from the PowerToys Settings process whenever a change is made to the file (using a FileWatcher) or whenever the KBM page is opened. The settings are updated only when the user presses the OK button from either of the Remap Keys or Remap Shortcuts windows. This is described in more detail [here](keyboardmanagerui.md#ok-and-cancel-button).
+
+## Low level keyboard hook handler
+Since the [`hook_proc`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L330-L349) cannot be a member function in the class, this is declared `static` and a `static pointer` to the `KeyboardManager` project is used ([`keyboardmanager_object_ptr`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L54-L55)).
+
+As seen in the code for `hook_proc`, similar to other keyboard hooks in PowerToys it consists of a main method `HandleKeyboardHookEvent` which computes whether the key needs to be suppressed and accordingly returns 1 or calls the `CallNextHook` method.
+
+`HandleKeyboardHookEvent` is covered in the [next section](#HandleKeyboardHookEvent). The `SetNumLockToPreviousState` code in the above snippet is required for a special scenario with keyboard input, which is covered in [this section](#Suppressing-Num-Lock-in-a-keyboard-hook).
+
+## HandleKeyboardHookEvent
+The [`HandleKeyboardHookEvent`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L384-L458) is the method which calls the corresponding remapping methods in the required order. The following checks are executed in order:
+- **`KeyboardManagerState.AreRemappingsEnabled`:** This returns false while the KBM remap tables are getting updated. If it is in this state, `HandleKeyboardHookEvent` returns `0`, i.e. the key event is not suppressed and is forwarded normally.
+- **Check for `KEYBOARDMANAGER_SUPPRESS_FLAG`:** If the key event has the suppress flag, the method returns 1 to suppress the key event.
+- **[`KeyboardManagerState.DetectSingleRemapKeyUIBackend`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L399-L408):** This method is used for handling hook operations for the single key Type UI in the Remap keys window. If the Remap keys window is open, then `HandleKeyboardHookEvent` returns `0` and the key event is forwarded normally. If the left column Type button is clicked on the Remap keys window and and the window is in focus, then the key event is suppressed and the UI is updated with the latest key from the recent key events. This method is described in more detail [here](keyboardmanagercommon.md#DetectSingleRemapKeyUIBackend-and-DetectShortcutUIBackend).
+- **[`KeyboardManagerState.DetectShortcutUIBackend(data, true)`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L410-L419):** This method is used for handling hook operations for the shortcut Type UI in the Remap keys window (when `isRemapKey` arg is `true`). If the Remap keys window is open, then `HandleKeyboardHookEvent` returns `0` and the key event is forwarded normally. If the right column Type button is clicked on the Remap keys window and and the window is in focus, then the key event is suppressed and the UI is updated with the shortcut from the recent key events. This method is described in more detail [here](keyboardmanagercommon.md#DetectSingleRemapKeyUIBackend-and-DetectShortcutUIBackend).
+- **`HandleSingleKeyRemapEvent`:** This method handles the single key remap logic. If a remapping takes place, the key event is suppressed. This method is described in more detail [here](keyboardeventhandlers.md#HandleSingleKeyRemapEvent).
+- **[`KeyboardManagerState.DetectShortcutUIBackend(data, false)`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L430-L439):** This method is used for handling hook operations for the shortcut Type UI in the Remap shortcuts window (when `isRemapKey` arg is `false`). If the Remap shortcuts window is open, then `HandleKeyboardHookEvent` returns `0` and the key event is forwarded normally. If the Type button is clicked on the Remap shortcuts window and and the window is in focus, then the key event is suppressed and the UI is updated with the shortcut from the recent key events. **Since this is executed after the single key remap method, all single key remappings are applied when the user is on the Remap shortcuts window.**
+- **`HandleAppSpecificShortcutRemapEvent`:** This method handles the app-specific shortcut remap logic. If a remapping takes place, the key event is suppressed. This method is described in more detail [here](keyboardeventhandlers.md#HandleAppSpecificShortcutRemapEvent). **Since this is executed after the single key remap method, single key remappings have precedence over shortcut remaps and are correspondingly reflected in shortcut remaps.**
+- **`HandleOSLevelShortcutRemapEvent`:** This method handles the global shortcut remap logic. If a remapping takes place, the key event is suppressed. This method is described in more detail [here](keyboardeventhandlers.md#HandleOSLevelShortcutRemapEvent). The app-specific remap method is executed before this because if a shortcut is remapped to different keys/shortcuts for a particular app and globally, the app-specific variant should be preferred if that app is in focus. **Since this is executed after the single key remap method, single key remappings have precedence over shortcut remaps and are correspondingly reflected in shortcut remaps.**
+
+**Note:** Single key remaps need to be executed before shortcut remaps, because otherwise there can be several logical issues. For example if a user has Ctrl remapped to X and Ctrl+A remapped to Y, we can't detect Ctrl+A because the moment Ctrl is pressed it would be remapped to X before the system ever sees Ctrl+A. This is why the design decision was made to separate Remap keys and Remap shortcuts, and all key remaps are reflected in the shortcut remaps.
+
+## Custom Action to launch KBM UI
+KBM uses the [`call_custom_action`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L249-L280) method from the `PowertoyModuleIface` in order to launch the KBM UI when the user clicks the Remap a key or Remap a shortcut button from the KBM settings page. On clicking the button, we check if there is already any active KBM UI window, and if there is it is brought to the foreground. If not, the corresponding KBM UI window is launched on a separate detached thread. The UI is described in more detail [here](keyboardmanagerui.md).
+
+## SendInput Special Scenarios
+
+### Extended keys
+Certain keys such as the arrow keys, right Ctrl/Alt , and Del/Home/Ins , etc need to be sent with the `KEYEVENTF_EXTENDEDKEY` flag because otherwise the NumPad versions get sent, which can cause weird behavior when NumLock is on. The code can be found [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L190-L194) and the list of extended keys in code can be found [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L73-L98). Docs about extended keys can be found [here](https://docs.microsoft.com/en-us/windows/win32/inputdev/about-keyboard-input#extended-key-flag).
+
+The weird behavior that is caused by this can be found at these issues:
+- https://github.com/microsoft/PowerToys/issues/3478
+- https://github.com/microsoft/PowerToys/issues/3647
+- https://github.com/microsoft/PowerToys/issues/3981
+
+### Scan code
+Certain applications (such as Windows Terminal) may filter out key events which are set to scan code 0. Even though the `KEYEVENTF_SCANCODE` flag is not set, the `wScan` field is still sent, which defaults to 0. To avoid this issue we use the `MapVirtualKey` API to find the scan code from the virtual key code. Code can be found [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L196-L198).
+
+## Special Scenarios
+Since we are using low level keyboard hooks and not actual OS level input handling certain scenarios with input require workarounds as do they not interact well with the OS input logic directly. These are covered in the sub-sections below.
+
+### Dummy key events
+To prevent the behavior that some modifiers have that occur when you press and release the modifier without pressing any key in between, we need to send a dummy key event in between the two states. Some examples of this behavior are Win key for Start Menu and Alt key to focus the menu bar. We need to send the dummy key events at any point where an unintentional modifier press/release sequence may occur. We use the undocumented `0xFF` virtual key code for this as we haven't found any side effects of using this key code yet. Initially we used only a key up message, but it has been tweaked now to send a key down followed by key up (code can be found (here)[https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L201-L208]), as without the key down there were [compatibility issues with some apps](https://github.com/microsoft/PowerToys/issues/7133) (like Slack).
+
+The dummy key event is currently used in the following places (the linked code snippets contains an example scenario of why it is required):
+- https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L251-L253
+- https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L289-L291
+- https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L382-L383
+- https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L409-L410
+- https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L509-L510
+
+### Suppressing Num Lock in a keyboard hook
+The Num Lock key state is updated by the OS before it is intercepted by low level hooks. This causes the issue that even if you suppress a Num Lock key event, Num Lock will still get toggled. In order to work around this, in the [`hook_proc`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L340-L344) whenever we suppress a Num Lock key down event, we send an additional Num Lock key up followed by key down so that the Num Lock state is reverted to it's previous value before the suppressed event. These are sent with a `KEYBOARDMANAGER_SUPPRESS_FLAG` in the `dwExtraInfo` field, so that we suppress them at the start of the hook (see code [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L811-L825)). Since these events will update the Num Lock state before the low level hooks, by suppressing them we ensure that these are not sent to any other hooks/applications and hence are only processed by the OS.
+
+This assumes that KBM is the last hook to be registered (since another hook-based app like AutoHotkey could remap NumLock to some other key which could mess up this logic).
+
+### Modifier-Caps Lock interaction on Japanese IME keyboards
+While using Japanese IME on Windows, shortcuts like Shift/Alt/Ctrl + Caps Lock can be used to switch IME options.
+
+
+
+These shortcuts are detected before low level hooks, and hence cause issues while remapping Caps Lock to Shift/Alt/Ctrl or vice-versa, as there could be an intermediate state where the system detects both the keys as being pressed. This results in a state where the modifier key does not get released since the OS suppresses the key up messages before they reach the low level hooks.
+
+In order to work around this when a key down for the modifier is being processed, we send a key up for the modifier key with the `KEYBOARDMANAGER_SUPPRESS_FLAG` in the `dwExtraInfo` field, so that we suppress them at the start of the hook, and this key event would only be processed by the OS, without getting forwarded to other hooks/apps. The approach is described in more detail at [this comment](https://github.com/microsoft/PowerToys/issues/3397#issuecomment-640136416), as discussed with the AutoHotkey team. The code for the workaround can be found [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L827-L846). Tests for these scenarios have also been added at:
+- [Tests for workaround on single key remaps](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/test/SingleKeyRemappingTests.cpp#L110-L219)
+- [Tests for workaround on shortcut remaps](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/test/OSLevelShortcutRemappingTests.cpp#L1935-L2144)
+
+For example, while [remapping Ctrl to Caps Lock ](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L59-L63), before sending the Caps Lock key down message and suppressing Ctrl , we send a suppressed Ctrl key up, so that the OS doesn't see Ctrl and Caps Lock pressed together at any point. For the [Caps Lock to Ctrl scenario](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L104-L116), we send a suppressed CCtrl trl key up message after sending Ctrl key down before Caps Lock suppressed. Similar logic is added for such scenarios in shortcut remapping.
+
+While the above work around fixes most of the cases, there are still some scenarios where the modifier can get stuck, mentioned at this [comment](https://github.com/microsoft/PowerToys/issues/3397#issuecomment-663729278), which is why the issue is still open. This occurs if a modifier is pressed after the remap has been invoked before releasing the remapped key and it is a harder scenario to solve which requires refactoring the single key remap code.
+
+### UIPI Issues (not resolved)
+`SendInput` does not work directly with certain key codes such as Play/Pause Media, Calculator key, etc as it requires UAC privileges to be injected to the OS and accordingly play the active media app or launch the Calculator app. In order to resolve this the correct approach is that the executable which calls `SendInput` needs to have the [UIAccess flag](https://docs.microsoft.com/en-us/windows/win32/winauto/uiauto-securityoverview) set to true, which will also avoid the requirement of KBM having to run as administrator to intercept key events when an elevated window is in focus. The UIAccess flag has many constraints such as it must be a signed executable and must be located in a protected path like Program Files. Since KBM currently runs out of the runner process, it would make more sense to do this work after KBM is moved to a separate executable, and it could be enabled by a separate toggle in settings only if PowerToys is installed in Program Files. [This comment](https://github.com/microsoft/PowerToys/issues/3192#issuecomment-646323661) has more details on this approach and (this)[https://github.com/microsoft/PowerToys/issues/3255] is the tracking issue.
+
+## Other remapping approaches
+Other approaches for remapping which were deprioritized are:
+
+### Registry approach
+This method is used by [SharpKeys](https://github.com/randyrants/sharpkeys) and involves using the [Microsoft Keyboard Scancode mapper registry key](https://github.com/randyrants/sharpkeys) to remap keys based on their scan codes. This has the advantage of being applied in all scenarios and not facing any elevation or UAC issues, however the disadvantages are that for modifying the settings the process must run elevated (as it modifies HKLM registry) and it requires a reboot to get applied. Another issue which is an advantage/disadvantage for users is that the process does not need to be running, so the remaps are applied all the time, including at the password prompt on logging in to the user's Windows account, which could get a user stuck if they orphaned a key in their password. This registry doesn't have any support for remapping shortcuts either, so the hook approach was prioritized over this.
+
+### Driver approach
+Using a driver approach has the benefit of not depending on precedence orders as KBM could always run before low level hooks, and it also has the benefit of differentiating between different keyboards, allowing [multi keyboard-specific remaps](https://github.com/microsoft/PowerToys/issues/1460). The disadvantages are however that any bug or crash could have system level consequences. [Interception](https://github.com/oblitum/Interception) is an open source driver that could be used for implementing this. The approach was deprioritized due to the potential side effects.
+
+## Telemetry
+Keyboard Manager emits the following telemetry events (implemented in [trace.h](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/trace.h) and [trace.cpp](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/trace.cpp)):
+- **`KeyboardManager_EnableKeyboardManager`:** Logs a `boolean` value storing the KBM toggle state. It is logged whenever KBM is enabled or disabled (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L305-L316)).
+- **`KeyboardManager_KeyRemapCount`:** Logs the number of key to key and key to shortcut remaps (i.e. all the remaps on the Remap a key window). This gets logged on saving new settings in the Remap a key window (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L159-L163)).
+- **`KeyboardManager_OSLevelShortcutRemapCount`:** Logs the number of global shortcut to shortcut and shortcut to key remaps. This gets logged on saving new settings in the Remap a shortcut window (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L220)).
+- **`KeyboardManager_AppSpecificShortcutRemapCount`:** Logs the number of app-specific shortcut to shortcut and shortcut to key remaps. This gets logged on saving new settings in the Remap a shortcut window (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L221)).
+- **`KeyboardManager_KeyToKeyRemapInvoked`:** Logs an event when a key to key remap is invoked (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L101-L102)).
+- **`KeyboardManager_KeyToShortcutRemapInvoked`:** Logs an event when a key to shortcut remap is invoked (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L101-L102)).
+- **`KeyboardManager_OSLevelShortcutToShortcutRemapInvoked`:** Logs an event when a global shortcut to shortcut remap is invoked (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L320-L321)).
+- **`KeyboardManager_OSLevelShortcutToKeyRemapInvoked`:** Logs an event when a global shortcut to key remap is invoked (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L320-L321)).
+- **`KeyboardManager_AppSpecificShortcutToShortcutRemapInvoked`:** Logs an event when an app-specific shortcut to shortcut remap is invoked (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L320-L321)).
+- **`KeyboardManager_AppSpecificShortcutToKeyRemapInvoked`:** Logs an event when an app-specific shortcut to key remap is invoked (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp#L320-L321)).
+- **`KeyboardManager_Error`:** Logs the occurrence of an error in KBM with the name of the method, error code and the corresponding error message. This is currently used only for logging `SetWindowsHookEx` failures (emitted [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L364-L369)).
diff --git a/doc/devdocs/modules/keyboardmanager/keyboardmanagercommon.md b/doc/devdocs/modules/keyboardmanager/keyboardmanagercommon.md
new file mode 100644
index 0000000000..dbdfe930f3
--- /dev/null
+++ b/doc/devdocs/modules/keyboardmanager/keyboardmanagercommon.md
@@ -0,0 +1,63 @@
+# Keyboard Manager Common
+This project contains any code that is to be shared between the backend and UI projects. This file covers any functionality in this project which hasn't been covered along with the other modules.
+
+## Table of Contents
+1. [KeyboardManagerState](#KeyboardManagerState)
+ 1. [UI States](#UI-States)
+ 2. [DetectSingleRemapKeyUIBackend and DetectShortcutUIBackend](#DetectSingleRemapKeyUIBackend-and-DetectShortcutUIBackend)
+ 3. [HandleKeyDelayEvent](#HandleKeyDelayEvent)
+ 4. [Saving remappings to file](#Saving-remappings-to-file)
+ 5. [Concurrent Access to remap tables](#Concurrent-Access-to-remap-tables)
+2. [KeyDelay](#KeyDelay)
+3. [Shortcut and RemapShortcut classes](#Shortcut-and-RemapShortcut-classes)
+ 1. [IsKeyboardStateClearExceptShortcut](#IsKeyboardStateClearExceptShortcut)
+ 2. [CheckModifiersKeyboardState](#CheckModifiersKeyboardState)
+ 3. [Tests](#Tests)
+4. [Helpers](#Helpers)
+ 1. [Foreground App Detection](#Foreground-App-Detection)
+
+## KeyboardManagerState
+[This class](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/KeyboardManagerState.cpp) stores all the data related to remappings and is also used in the sense of a View Model as it used to communicate common data that is shared between the KBM UI and the backend. They are accessed on the UI controls using static class members of `SingleKeyRemapControl` and `ShortcutControl`.
+
+### UI States
+[UI states](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.h#L27-L42) are used to keep track in which step of the UI flow is the user at, such as which Remap window they are on, or if they have one of the Type windows open. This is required because the hook needs to suppress input and update UI in some cases, and in some cases remappings have to be disabled altogether.
+
+### DetectSingleRemapKeyUIBackend and DetectShortcutUIBackend
+[These methods](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L374-L446) are [called on the low level hook](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/dllmain.cpp#L399-L408) in the main keyboard event handler. When the user opens any UI window the UI states are updated and in this case some remappings have to be disabled. On the Remap keys window, all remappings are disabled, while on the Remap shortcuts window, shortcut remappings are disabled.
+
+In addition to this, if the user has opened the Type window, and the window is in focus, [whenever a key event is received we have to update the set of selected keys in the TextBlock](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L266-L329) in the ContentDialog. These methods also call the `KeyDelay` handlers to check if the input is Esc/Enter and accordingly handle the Accessibility events for the Type window. When the user clicks the Type button, [variables in the KeyboardManagerState store the corresponding TextBlocks](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp#L375-L376) which appear in the ContentDialog, so that these UI controls can be updated from the hook on the dispatcher thread.
+
+### HandleKeyDelayEvent
+[This method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L482-L498) checks if the UI is in the foreground, and if so runs the key delay handlers that have been registered.
+
+### Saving remappings to file
+The [`SaveConfigToFile`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L500-L607) method is called on clicking the OK button on the EditKeyboardWindow or EditShortcutsWindow. Since PowerToys Settings also reads the config JSON file, [a named mutex is used](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L582-L600) before accessing the file, with a 1 second timeout. If the mutex is obtained the settings are written to the default.json file.
+
+### Concurrent Access to remap tables
+To prevent the UI thread and low level hook thread from concurrently accessing the remap tables we use an [`atomic bool` variable](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.h#L91-L92), which is set to `true` while the tables are getting updated. When this is `true` the hook will skip all remappings. Use of mutexes in the hook were removed to prevent re-entrant mutex bugs.
+
+## KeyDelay
+[This class](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/KeyDelay.cpp) implements a queue based approach for processing key events and based on the time difference between key down and key up events [executes separate methods for `ShortPress`, `LongPress` or `LongPressReleased`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyDelay.h#L69-L72). The class is used for the hold Enter/Esc functionality required for making the Type window accessible and prevent keyboard traps (see [this](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp#L273-L292) for an example of it's usage). The `KeyEvents` are added to the queue from the hook thread of KBM, and a separate [`DelayThread`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyDelay.cpp#L142-L166) is used to process the key events by checking the `time` member in the key event. The thresholds for short vs long press and hold wait timeouts are `static` constants, but if the module is extended for other purposes these could be made into arguments.
+
+**Note:** [Deletion of the `KeyDelay`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyDelay.cpp#L4-L12) object should never be called from the `DelayThread` i.e. from within one of the 3 handlers, as it can re-enter the mutex and would lead to a deadlock. This can be avoided by either deleting it on a separate thread or as done in the KBM UI, on the dispatcher thread. See [this PR](https://github.com/microsoft/PowerToys/pull/6959#issue-496583547) for more details on this issue.
+
+## Shortcut and RemapShortcut classes
+The [`Shortcut` class](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/Shortcut.h) is a data structure for storing key combinations which are valid shortcuts and it contains several methods which are used for shortcut specific operations. [`RemapShortcut`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/RemapShortcut.h) consists of a shortcut/key union (`std::variant`), along with other boolean flags which are required on the hook side for storing any relevant keyboard states mid-execution.
+
+### IsKeyboardStateClearExceptShortcut
+[This method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Shortcut.cpp#L665-L813) is used by the `HandleShortcutRemapEvent` to check if any other keys on the keyboard have been pressed apart from the keys in the shortcut. This is required because shortcut to shortcut remaps should not be applied if the shortcut is pressed with other keys. The method iterates over all the possible key codes, except any keys that are considered reserved, unassigned, OEM-specific or undefined, as well as mouse buttons (see list [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Shortcut.cpp#L628-L663)).
+
+### CheckModifiersKeyboardState
+[This method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Shortcut.cpp#L517-L614) uses `GetVirtualKeyState` (internally calls `GetAsyncKeyState` in production code), to check if all the modifiers of the current shortcut are being pressed. Since Win doesn't have a non-L/R key code we check this by checking both LWIN and RWIN.
+
+### Tests
+Tests for some methods in the `Shortcut` class can be found [here](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/ShortcutTests.cpp).
+
+## Helpers
+[This namespace](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/common/Helpers.cpp) has any methods which are used across either UI or the backend which aren't specific to either. Some of these methods have tests [here](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/SetKeyEventTests.cpp).
+
+### Foreground App Detection
+[`GetCurrentApplication`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L226-L268) is used for detecting the foreground process for App-specific shortcuts. The logic is very similar to that used for FZ's app exception feature, involving `GetForegroundWindow` and `get_process_path`. The one additional case which has been added is for full-screen UWP apps, where the above method fails and returns `ApplicationFrameHost.exe`. The [`GetFullscreenUWPWindowHandle`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/Helpers.cpp#L210-L224) uses `GetGUIThreadInfo` API to find the window linked to the GUI thread. This logic is based on [this stackoverflow answer](https://stackoverflow.com/questions/39702704/connecting-uwp-apps-hosted-by-applicationframehost-to-their-real-processes/55353165#55353165).
+
+**Note:** The [`GetForegroundProcess` method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/dll/Input.cpp#L17-L21) performs string allocation in a weird way because of exceptions that were occurring while running tests as a result of memory being allocated or deallocated across dll boundaries. Here's the comment from the PR where this was added
+> To make app-specific logic test-able, a GetForegroundProcess was added to the input interface which internally calls GetCurrentApplication. This allows us to mock this method in the test project by just setting some process name as the foreground process for that function. When I set this to just return the string name, it would goes runtime errors on the test project in debug_heap with `__acrt_first_block == header`. Based on [this stackoverflow answer](https://stackoverflow.com/a/35311928), this would happen if allocation happens in one dll's code space and deallocation happens in another. One way to avoid this is to change both the projects to MD (multi threaded dll) instead of MT(multi threaded), however that results in many compile-time errors since all the PT projects are configured as MT. To solve this, the GetForegroundProcess was rewritten such that its argument is the output variable, and we allocate memory for that string within the AppSpecificHandler method rather than in that function.
\ No newline at end of file
diff --git a/doc/devdocs/modules/keyboardmanager/keyboardmanagerui.md b/doc/devdocs/modules/keyboardmanager/keyboardmanagerui.md
new file mode 100644
index 0000000000..854d6f640d
--- /dev/null
+++ b/doc/devdocs/modules/keyboardmanager/keyboardmanagerui.md
@@ -0,0 +1,122 @@
+# Keyboard Manager UI
+
+## Table of Contents:
+1. [C++ XAML Islands](#c---xaml-islands)
+ 1. [Debugging exceptions in XAML Islands](#debugging-exceptions-in-xaml-islands)
+ 2. [Build times](#build-times)
+ 3. [Setting custom backgrounds for Xaml Controls using brushes](#setting-custom-backgrounds-for-xaml-controls-using-brushes)
+2. [UI Structure](#ui-structure)
+3. [EditKeyboardWindow/EditShortcutsWindow](#editkeyboardwindow-editshortcutswindow)
+ 1. [OK and Cancel button](#ok-and-cancel-button)
+ 2. [Delete button](#delete-button)
+ 3. [Handling common modifiers in EditKeyboardWindow](#handling-common-modifiers-in-editkeyboardwindow)
+4. [SingleKeyRemapControl](#singlekeyremapcontrol)
+5. [ShortcutControl](#shortcutcontrol)
+6. [KeyDropDownControl](#keydropdowncontrol)
+ 1. [Localized key names](#localized-key-names)
+ 2. [Single Key ComboBox Selection Handler](#single-key-combobox-selection-handler)
+ 3. [Shortcut ComboBox Selection Handler](#shortcut-combobox-selection-handler)
+
+## C++ XAML Islands
+The KBM UI is implemented as a C++ XAML Island, but all the controls are implemented in code behind rather than .xaml and .xaml.cs files. This was done as per a XAML Island Code sample and it didn't require a separate UWP project, which could be limited in terms of using hooks. There is a [tech debt item](https://github.com/microsoft/PowerToys/issues/2027) for moving this to XAML. The reason it wasn't implemented in the C# Settings was because it required communication with the low level hook thread, which could be too slow if IPC is used, since the UI needs to update on every key event.
+
+**Note:** For functions which take a XAML component as argument, pass it by value and not by reference. This is because `winrt` WinUI classes store their own internal references, so they are supposed to be passed by value (and internally ref counts are incremented). Passing by reference can lead to weird behavior where the object is `null`.
+
+The windows are [created as C++ windows](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L128-L140) and the window sizes are set to default by [scaling them as per DPI](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L120-L126) using the `DPIAware::Convert` API from common lib. Since the UI is launched on a new thread, the window may not be in the foreground, so [we call `SetForegroundWindow`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L146-L150).
+
+`DesktopWindowXamlSource` has to be declared and [it is initialized](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L159-L162) using the [`XamlBridge`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/ui/XamlBridge.cpp), and [a second window handle](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L161-L162) is generated for the internal Xaml Island window. Most of the code was based on the [Xaml Island Sample](https://github.com/microsoft/Xaml-Islands-Samples/blob/master/Samples/Win32/SampleCppApp/XamlBridge.cpp). The `XamlBridge` class contains code which handles initializing the Xaml Island containers as well as handling special messages like keyboard navigation, and focus between islands and between the C++ window and the island. It also has methods for clearing the xaml islands and closing the window.
+
+Once the UI controls are created, the parent container is set as the content for the `DesktopWindowXamlSource` and the `XamlBridge.MessageLoop` is executed. Messages are processed by the C++ window handler like [`EditKeyboardWindowProc`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L364-L404). The general structure we use for this is, for any `WM_PAINT` or `WM_SIZE` message we resize the Xaml Island window. For `WM_GETMINMAXINFO` we set minimum widths so that the window cannot be resized beyond a minimum height and width. This is done to prevent the WinUI elements from overlapping and getting cropped. If it is neither of these cases we send the message to the [`XamlBridge.MessageHandler`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/XamlBridge.cpp#L291-L301) which handles Destroy, Activation and Focus. If `WM_NCDESTROY` is received when the `XamlBridge` is `nullptr`, the window thread is terminated.
+
+**Note:** `ContentDialog` in Xaml Islands requires manually settings a `XamlRoot`. This can generally be done by passing the XamlRoot from a component in the main window, such as the button used to open the dialog ([`sender.as().XamlRoot()`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/ShortcutControl.cpp#L31-L32)). [These docs]((https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.contentdialog#contentdialog-in-appwindow-or-xaml-islands)) have more details about this.
+
+### Debugging exceptions in XAML Islands
+Sometimes if an exception occurs in XAML Islands, the stack trace may not always point to the correct code causing the exception and instead it will point to the Xaml Island message loop. In these cases the output window in VS will generally show the correct exception.
+
+### Build times
+C++ Xaml Islands generally take several minutes to build because the `pch` which contains the WinUI headers takes longer to build and compiles to a file of several GBs. To minimize the build times, multi-processor compilation within the projects have been enabled (files are distributed for compilation to the processors), and references to the Xaml headers have been removed from the .h headers files as much as possible. Since several classes of ours had class members with UI controls like `StackPanel` (which requires definitions of the classes in order to compile), we worked around this by declaring them as `IInspectable` (the equivalent of an object pointer in winrt), and initializing them to the actual control like `StackPanel` in the constructor and accessing all their member functions by inline typecasting (for `IInspectable x;` we do `x = StackPanel();` and `x.as().MemberFunction()`). Check [this](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/ShortcutControl.cpp#L19-L25) for this type of usage in `ShortcutControl`.
+
+### Setting custom backgrounds for Xaml Controls using brushes
+To access the brushes available on C# Xaml, it has to be done with the `Resources.Lookup` syntax:
+`primaryButton.Background(Windows::UI::Xaml::Application::Current().Resources().Lookup(box_value(L"SystemControlBackgroundBaseMediumLowBrush")).as());`
+
+## UI Structure
+The KBM UI consists of a [`Grid` with several columns](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L200-L218). Rows are added dynamically when [the add button is pressed](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L305-L309). [A vector of vector of unique pointers to `SingleKeyRemapControl`/`ShortcutControl`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L248-L249) is created so that references to the UI components and their data are not lost until the window is closed. [`SingleKeyRemapControl`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp) is the UI class for each row of the Remap keys table, and [`ShortcutControl`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/ui/ShortcutControl.cpp) is the UI class for each row of the Remap shortcuts table. [`KeyDropDownControl`](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp) is used for handling the ComboBox operations. Each of these two classes [have vectors of unique pointers to the `KeyDropDownControl` objects](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/ShortcutControl.h#L44-L45) so that references to the objects are active until the control is deleted.
+
+When the UI windows are activated the `KeyboardManagerState` object [sets the `UIState` variable](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L251-L252) which is used for distinguishing if the UI is up from the keyboard hook thread. The [states are also updated](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp#L53) on opening and closing the Type window.
+
+Clicking the Type Button [opens a content dialog](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp#L206-L380) which registers key delays using the [`KeyDelay` class](keyboardmanagercommon.md#KeyDelay) for Enter and Esc keys and sets the UI states such that when a key event occurs the TextBlocks on the ContentDialog are updated accordingly. On accepting the dialog the selected keys are copied into the ComboBoxes from the TextBlocks, and on closing the window the key delays are unregistered and UI states are reset.
+
+Since ComboBoxes are added dynamically, handlers have been added which [update the accessible names for these controls](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L69-L74), which get executed whenever a drop down is added or removed.
+
+When the `EditKeyboardWindow`/`EditShortcutsWindow` is created, [we iterate through the remappings](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L254-L262) stored in `KeyboardManagerState` and add rows to the UI Grid. For both the windows we have `static` buffers [`singleKeyRemapBuffer`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.h#L39-L40) and [`shortcutRemapBuffer`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/ShortcutControl.h#L42-L43) which store the corresponding key/shortcuts as per the selections in the UI if they are valid with no warnings.
+
+## EditKeyboardWindow/EditShortcutsWindow
+
+### OK and Cancel button
+[On pressing the OK button](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp#L66-L89) in `EditKeyboardWindow`, first the [`CheckIfRemappingsAreValid` method](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L10-L44) is executed which performs basic validity checks on the current remappings in the remap buffer (`static SingleKeyRemapControl::singleKeyRemapBuffer`), such as if there are no NULL columns and none of the source keys are repeated. All other validity checks are assumed to happen while the user adds the remapping. If this is found to be invalid a ContentDialog is displayed which shows that some remappings are invalid and if the user proceeds only the valid ones will be applied. If it is valid [`GetOrphanedKeys`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L46-L75) is executed which checks if any keys are orphaned (i.e. the key has been remapped and no other key has been remapped to it, so there is no way to send that key code), and a dialog is shown for notifying the user with a list of orphaned keys. After this the settings are [applied by adding it to the `KeyboardManagerState.singleKeyReMap` member](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L102-L164) and they are saved to the JSON file. `EditShortcutsWindow` differs slightly from this, as there is no orphaned keys check, and [on pressing OK](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp#L32-L47) both the global and app-specific shortcuts are validated and [updated](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L166-L223).
+
+The code used for updating the remapping tables in `KeyboardManagerState` can be found [here](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L104-L183). For shortcut remaps, the `sortedKeys` vectors are updated and re-sorted whenever an element is added to them (like [this](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/common/KeyboardManagerState.cpp#L135-L136)).
+
+On pressing OK (after confirmation dialogs) or Cancel, the window is closed and UI states are reset.
+
+### Delete button
+Since there is no single method to delete the elements in a row for a Grid, [the logic](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/SingleKeyRemapControl.cpp#L143-L188) we use involves decrementing the rowIndex for all the UI controls that appearing after the row to be deleted, and removing each of the items of the row from the Grid, followed by deleting that row definition. We also update the accessible names for all the rows since the indexing has changed. After this the corresponding row in the remap buffer is also deleted, and `SingleKeyRemapControl`/`ShortcutControl` objects are deleted from the vector.
+
+### Handling common modifiers in EditKeyboardWindow
+In the SingleKeyRemap table for a remapping of the form Ctrl->X, where Ctrl is the common version and not L/R, we can't store it directly as Ctrl->X because when the hook receives the key event it only gets LCtrl or RCtrl specifically and not `VK_CONTROL`. To simplify the backend code, when [single key remappings are applied](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L116-L143), any remapping of the form Ctrl->X is split into Ctrl(L)->X and Ctrl(R)->X (i.e. both L and R versions are remapped to the same target), and when remappings are loaded in EditKeyboardWindow, we [pre-process the remap table](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/LoadingAndSavingRemappingHelper.cpp#L77-L100) such that if the L and R versions of a modifier are remapped to the same key/shortcut we combine them. This also results in the behavior where a user adds LCtrl->X and RCtrl->X and after closing and re-opening KBM UI it appears combined as Ctrl->X.
+
+## SingleKeyRemapControl
+The left drop down column uses a single ComboBox and the Type button is linked to `createDetectKeyWindow`, whereas the right column is linked to `createDetectShortcutWindow` as the column can accept a key or a shortcut (required to support key to key and key to shortcut). The `KeyDropDownControl` for the left column in the window uses a smaller key list, without `None`.
+
+## ShortcutControl
+Both the columns in are linked to `createDetectShortcutWindow`, however the drop down selection handlers differ in their logic as the left column only allows shortcuts, and the drop downs do not contain the `Disable` key, whereas the right column allows you to select both shortcuts and keys (to support shortcut to shortcut and shortcut to key), and it allows selection of `Disable`.
+
+For the app-specific shortcut target app text-box, we had to validate that the shortcut row is still valid when the target app is changed (for example, Ctrl+A is remapped for Chrome, and another remapping for Ctrl+A was remapped to Edge, but the target was changed to Chrome.). For this we didn't use the TextChanged handler as every time a letter is typed it would get executed. Instead we used the [`LostFocus` handler](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/ShortcutControl.cpp#L108-L167) which gets executed whenever you focus into the box (by clicking or tabbing) and then tabbing or clicking out. In the method we perform the same shortcut buffer validation used for selections in the drop down menus and update the buffers accordingly.
+
+## KeyDropDownControl
+Each ComboBox has a linked flyout, which is used to show warnings to the users whenever a user selects an invalid key from the drop down. When the warning is displayed the ComboBox is also reset to -1, i.e. no selection.
+
+For selection handlers on the ComboBoxes we couldn't use just the SelectionChanged handler directly as it gets executed even on searching for elements in the drop down. Instead we used DropDownClosed (when a user opens the drop down and searches and selects something) and SelectionChanged when the drop down is not open (for setting selections programmatically or selection made by searching with tab focus on the drop down without opening it). This was required because if we execute the selection handlers while users are searching, it could cause false positive flyout warnings if the search causes an invalid value to be selected, and flyouts cause the drop down to close leading to bad UI experience.
+
+### Localized key names
+For getting localized key names and symbols for each virtual key code, whenever the key lists are accessed, i.e. [whenever the drop down is opened](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L56-L60) or when `GetKeyName` is called in the Type window, the current `KeyboardLayout` is retrieved to ensure that the displayed key names are always updated. Since the `WM_INPUTLANGCHANGED` event was having some issues with XAML islands we weren't able to use this to update the keyboard layout. In addition to this we do not refresh the UI, so the key lists get updated only on opening/interacting with them.
+
+### Single Key ComboBox Selection Handler
+On making a selection in the drop down, [the selection handler](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L91-L130) validates the input with the buffer from the other column and other rows. Error messages are shown using flyouts if the selection is not considered valid and the drop down and buffer for that entry are reset to empty selection. The errors that can occur on the single key ComboBox are:
+- Remap to same key (A->A)
+- Same key previously remapped (A->B and A->C)
+- Conflicting modifier previously remapped (Ctrl->A and Ctrl(left)->B, since Ctrl also includes Ctrl(left))
+If the selection is found to be valid, the `singleKeyRemapBuffer` is updated accordingly.
+For handling `Shortcut` and key in the remap buffer for the right column, we use `std::variant`, which allows us to store either of the two types and check which one of them is present in the buffer by using the `index` method.
+[`ValidateAndUpdateKeyBufferElement`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/BufferValidationHelpers.cpp#L8-L66) does not reference any UI components and instead takes all the relevant data as arguments. This method [has tests](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/BufferValidationTests.cpp) which covers all the cases that could arise from making selections on the UI.
+
+### Shortcut ComboBox Selection Handler
+On making a selection in the drop down, [the selection handler](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L215-L295) validates the input with the buffer from the other column and other rows. Error messages are shown using flyouts if the selection is not considered valid and the drop down and buffer for that entry are reset to empty selection.
+This differs from the Single Key ComboBox handler in the sense that after validating the current selection we may perform [a set of actions](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L160-L204) such as:
+- Adding a drop down (if a modifier is selected)
+- Removing a drop down (if None is selected)
+- Clearing terminal empty drop downs (if an action key is selected in a non-last drop down and the remaining ones are empty)
+
+After performing the corresponding action, if any, we check if the drop down resulted in an error, in which case we do [a second level of validation](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L224-L229) on all the drop downs in that list of drop downs. This is done because there can be cases where an error in one drop down results us setting it to empty, and the remaining selection is also invalid. For example, you have Ctrl+A -> Ctrl+Shift+A, and you change Shift to Ctrl. This would show a warning for having two Ctrls in the shortcut being invalid, after which setting that to empty would result in Ctrl+A->Ctrl+Empty+A, which is a case of remapping a shortcut to itself.
+
+Once this second level of validation is done, we proceed with [updating the buffer](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L231-L251). Depending on the number of drop downs with valid values, this could be either a key or a shortcut (for the right columns). We also [set the buffer value for the target app](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L252-L267) while doing this.
+
+Unlike the Single Key handler, there is a different set of errors that can occur here which are related to making a selection that is considered as a valid shortcut. The `isHybridControl` argument is used to distinguish between the differing behaviors for the two types of columns (shortcut only or shortcut/key column). The errors that can occur for this handler are:
+- Shortcut must start with modifier (selecting A on the first drop for the left column is invalid)
+- Shortcut can't have a repeated modifier (Ctrl+Ctrl(left)+A is not a shortcut)
+- Shortcut can only have upto 2 modifiers (Ctrl+Shift+Alt is not supported as we have enforced a 3 key constraint (**not a backend limitation, there is [an issue](https://github.com/microsoft/PowerToys/issues/3936) requesting to remove this**))
+- Shortcut must contain an action key (Ctrl+A and change A to None, only for left column)
+- Shortcut must have atleast two keys (Ctrl+A and change Ctrl to None, only for left column)
+- Disable can't be a modifier or action key (Ctrl+Disable is invalid)
+- Shortcut can't have more than one action key (Ctrl+Shift+A, change Shift to B)
+- Remap to same shortcut(Ctrl+A->Ctrl+A)
+- Same shortcut previously remapped for same target app (Ctrl+A->B and Ctrl+A->C)
+- Conflicting shortcut previously remapped for same target app (Ctrl+A->B and Ctrl(left)+A->C, since Ctrl also includes Ctrl(left))
+- Illegal shortcut remaps like Win+L or Ctrl+Alt+Del (since these cannot be remapped using LL hooks)
+
+[`ValidateShortcutBufferElement`](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/BufferValidationHelpers.cpp#L68-L304) does not reference any UI components and instead takes all the relevant data as arguments. This method [has tests](https://github.com/microsoft/PowerToys/blob/master/src/modules/keyboardmanager/test/BufferValidationTests.cpp) which covers all the cases that could arise from making selections on the UI.
+
+**Note:** After updating the buffer we have [code to handle a special case](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L269-L279), which was required to prevent scenarios where a drop down can get deleted but the corresponding `KeyDropDownControl` object isn't deleted. The code checks if the drop down is still linked to the parent and accordingly deletes the `KeyDropDownControl` object from the vector.
+
+**IgnoreKeyToShortcutWarning special case:** [An additional](https://github.com/microsoft/PowerToys/blob/b80578b1b9a4b24c9945bddac33c771204280107/src/modules/keyboardmanager/ui/KeyDropDownControl.cpp#L177-L181) check was added to ignore the Map to Same key error when an existing remapping is loaded. This was because a remapping like Ctrl->Ctrl+A has an intermediate step of Ctrl->Ctrl, which could lead to an error of invalid input, even though Ctrl+A is valid. The only way to actually add this is from the Type button or by adding them in a different order (like typing Shift+A and then changing Shift to Ctrl). Since the intermediate check could fail, this was causing the app to crash since the Xaml Island wouldn't be completely loaded at that point and the Flyout can't be displayed. [This](https://github.com/microsoft/PowerToys/issues/6695) is the linked issue which describes the repro scenario.
diff --git a/doc/devdocs/modules/launcher/architecture.md b/doc/devdocs/modules/launcher/architecture.md
new file mode 100644
index 0000000000..f0287f56dc
--- /dev/null
+++ b/doc/devdocs/modules/launcher/architecture.md
@@ -0,0 +1,48 @@
+# Architecture
+
+## Overview
+`PowerToys Run` is a plugin-based .net core desktop application. It is written in WPF using `Model-View-ViewModel (MVVM)` structural design pattern. This article provides an overview of `PowerToys Run` architecture and introduces major components in the data flow.
+
+Note : We refer to base application without plugins as `PowerLauncher`, which is same as the name of startup WPF project.
+
+## UI
+PowerToys Run UI is written in the WPF framework. The UI code is present in the Powerlauncher project and is spanned across three high-level components: [`MainWindow.xaml`](/src/modules/launcher/PowerLauncher/MainWindow.xaml), [`LauncherControl.xaml`](/src/modules/launcher/PowerLauncher/LauncherControl.xaml) and [`ResultList.xaml`](/src/modules/launcher/PowerLauncher/LauncherControl.xaml). These components are discussed below.
+
+
+**Fig 1: PowerToys Run UI architecture**
+
+1. **[`MainWindow.xaml`](/src/modules/launcher/PowerLauncher/MainWindow.xaml)**: This is the outermost-level UI control. It is composed of lower-level UI components such as [`LauncherControl.xaml`](/src/modules/launcher/PowerLauncher/LauncherControl.xaml) and [`ResultList.xaml`](/src/modules/launcher/PowerLauncher/LauncherControl.xaml). The corresponding code-behind file implements all the UI related functionalities such as autosuggest, key-bindings, toggling visibility of WPF window and animations.
+2. **[`LauncherControl.xaml`](/src/modules/launcher/PowerLauncher/LauncherControl.xaml)**: This control implements the UI component for editing query text.(marked in red in Fig 1) It consists of two overlapping WPF controls, `TextBox` and `TextBlock`. The outer `TextBox` is used for editing query whereas the inner `TextBlock` is used to display autosuggest text.
+3. **[`ResultList.xaml`](/src/modules/launcher/PowerLauncher/LauncherControl.xaml)**: This control implements the UI component for displaying results (marked in green in Fig 1). It consists of a `ListView` WPF control with a custom `ItemTemplate` to display application logo, name, tooltip text, and context menu.
+
+## Data flow
+The backend code is written using the `Model-View-ViewModel (MVVM)` structural design pattern. Plugins act as `Model` in this project. A detailed overview of the project's structure is given [here](/doc/devdocs/modules/launcher/project_structure.md).
+
+#### Flow of data between UI(view) and ViewModels
+Data flow between View and ViewModel follows typical `MVVM` scheme. Properties in viewModels are bound to WPF controls and when these properties are updated, `INotifyPropertyChanged` handler is invoked, which in turn updates UI. The diagram below provides a rough sketch of the components involved.
+
+**Fig 2: Flow of data between UI and ViewModels.**
+
+#### Flow of data between ViewModels and Plugins(Model)
+`PowerLauncher` interact with plugins using [`IPlugin`](/src/modules/launcher/Wox.Plugin/IPlugin.cs) and `IDelayedExecutionPlugin` interface. [`IPlugin`](/src/modules/launcher/Wox.Plugin/IPlugin.cs) is used for initialization and making queries which are fast (typically return results in less than 100ms).[`IDelayedExecutionPlugin`](/src/modules/launcher/Wox.Plugin/IDelayedExecutionPlugin.cs) is used for long-running queries and is implemented only when required. For example, [`IDelayedExecutionPlugin`](/src/modules/launcher/Wox.Plugin/IDelayedExecutionPlugin.cs) is implemented by indexer plugin for searching files with names of form \*abc\*.
+```
+ public interface IPlugin
+ {
+ // Query plugin
+ List Query(Query query);
+
+ // Initialize plugin
+ void Init(PluginInitContext context);
+ }
+
+ public interface IDelayedExecutionPlugin : IFeatures
+ {
+ // Query plugin
+ List Query(Query query, bool delayedExecution);
+ }
+```
+
+**Fig 3: Flow of data between ViewModels and Plugins.**
+
+#### Requesting services from powerlauncher
+Plugins could use the [`IPublicAPI`](/src/modules/launcher/Wox.Plugin/IPublicAPI.cs) interface to request services such as getting the current theme (for deciding logo background), displaying messages to the user, and toggling the visibility of PowerLauncher.
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/debugging.md b/doc/devdocs/modules/launcher/debugging.md
new file mode 100644
index 0000000000..018d36e2c4
--- /dev/null
+++ b/doc/devdocs/modules/launcher/debugging.md
@@ -0,0 +1,20 @@
+# Debugging
+`PowerToys Run` is a single exe file associated with `launcher.exe` process and debugger should be attached to this process. There are two approaches to debug `PowerToys Run`. Both these approaches differ in the compile-time and the range of functionalities that could be debugged. These methods are discussed in detail in the following sections.
+
+
+## Debugging Prerequisite
+Setup development environment for PowerToys by following instruction [here.](https://github.com/microsoft/PowerToys/tree/master/doc/devdocs#prerequisites-for-compiling-powertoys)
+
+## Direct debugging
+This approach is used to test UI, plugins, and core `PowerToys Run` functionality. This **cannot** be used to test `PowerToys Run` settings. The approach is significantly faster compared to `Debugging with runner`, as it requires compiling projects relevant to `PowerToys Run`. Please follow the steps below for direct debugging.
+1. Right-click on `modules->launcher->PowerLauncher` and select `Set as startup Project`.
+2. Press `F5` to start debugging.
+
+## Debugging with runner
+This approach can be used to test UI, plugins, core `PowerToys Run` functionality and `PowerToys Run` settings. This approach **cannot** be used to debugg functions that execute on starting `launcher.exe` process. This requires building runner along with all the other modules on first compile, making it slower than `Direct debugging` approach. The subsequent compilations should be fast.
+1. Right-click on `runner` and select `Set as startup Project`.
+2. Press `F5` to start debugging.
+3. Attach debugger to `launcher.exe` process.
+ 1. Go to `Debug->Attach to process..`
+ 2. Filter and select `launcher.exe` process.
+ 3. Click on `Attach`.
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/plugins/calculator.md b/doc/devdocs/modules/launcher/plugins/calculator.md
new file mode 100644
index 0000000000..8d5c44fa2b
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/calculator.md
@@ -0,0 +1,23 @@
+# Calculator Plugin
+The Calculator plugin as the name suggests is used to perform calculations on the user entered query.
+
+
+
+### [`CalculateHelper`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs)
+- The [`CalculateHelper.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateHelper.cs) class checks to see if the user entered query is a valid input to the calculator and only if the input is valid does it perform the operation.
+- It does so by matching the user query to a valid regex.
+
+### [`CalculateEngine`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs)
+- The main computation is done in the [`CalculateEngine.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs) file using the `Mages` library.
+
+```csharp
+var result = CalculateEngine.Interpret(query.Search, CultureInfo.CurrentUICulture);
+```
+
+### [`CalculateResult`](src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateResult.cs)
+- The class which encapsulates the result of the computation.
+- It comprises of the `Result` and `RoundedResult` properties.
+
+### Score
+The score of each result from the calculator plugin is `300`.
+
diff --git a/doc/devdocs/modules/launcher/plugins/folder.md b/doc/devdocs/modules/launcher/plugins/folder.md
new file mode 100644
index 0000000000..2248b16d86
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/folder.md
@@ -0,0 +1,17 @@
+# Folder Plugin
+The Folder plugin is used to navigate the directory structure and display the sub-folders and files within a folder.
+
+
+### [`FolderHelper.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs)
+- The [`FolderHelper`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/FolderHelper.cs) class leverages the `DriveInformation` and `folderLinks` to get the folder results for a user query.
+- The [`DriveInformation`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/Path/DriveInformation.cs) class gets the list of all drives on the system.
+- The [`FolderLink`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/FolderLink.cs) object corresponds to a user created link for frequently accessed projects. This was inherited from Wox but is presently not functional as we don't have the UI setup in settings to get this user input. Each folderLink object has a `nickname`, which is the name of the folder and this can be used to directly access that folder instead of entering the entire path.
+
+### [`IFolderProcessor.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/Sources/IFolderProcessor.cs)
+The `IFolderProcessor` utilizes the `FolderHelper` class to extract the folders and return the results.
+There are two types of Folder Processors, based on the type of information they are processing -
+1. [`UserFolderProcessor`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/UserFolderProcessor.cs) - This Processor is currently not used in PT Run but it is used to process the user created folder links.
+2. [`InternalDirectoryProcessor`](src/modules/launcher/Plugins/Microsoft.Plugin.Folder/InternalDirectoryProcessor.cs) - This processor is used to retrieve the files and folders located within the current drive or shared folder.
+
+### Score
+The first result is of score 500 and the following results are scored 10.
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/plugins/indexer.md b/doc/devdocs/modules/launcher/plugins/indexer.md
new file mode 100644
index 0000000000..63519a0583
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/indexer.md
@@ -0,0 +1,39 @@
+# Indexer Plugin
+The indexer plugin is used to search for files within the indexed locations of the system.
+
+
+
+### [Drive Detection](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/DriveDetection)
+- There are two indexing modes in Windows:
+ 1. **Classic mode**: Only the desktop and certain customizable locations in the system are indexed. All the systems have the classic mode enabled by default.
+ 2. **Enhanced Mode**: This mode indexes the entire PC when enabled. The user can exclude certain locations from being indexed in this mode from the Windows Search settings options.
+- A drive detection warning is displayed to the users when only the custom mode is enabled on the system informing the user that not all the locations on their PC are indexed as this could lead to some results not showing up.
+- The [`IndexerDriveDetection.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/DriveDetection/IndexerDriveDetection.cs) file gets the status of the drive detection checkbox in the settings UI and depending on whether the enhanced mode is enabled or disabled, displays the warning.
+- To determine whether the `EnhancedMode` is enabled or not, we check the local machine registry entry for `EnableFindMyFiles`. If it is set to 1, the enhanced mode is enabled.
+
+### [`OleDBSearch`](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/OleDBSearch.cs)
+- The `Query` function within the [`OleDBSearch.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/OleDBSearch.cs) class takes in the query and the connection string to the SystemIndex catalog as arguments and returns a list of results.
+- It first opens a [connection][OLEDBConnection] to the Windows Indexer database, creates an [OleDB command][OLEDBCommand] and executes the command to get a list of results.
+
+### [`WindowsSearchAPI`](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs)
+- The [`WindowsSearchAPI`](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs) class leverages the [`OleDBSearch.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/OleDBSearch.cs) class to execute the query.
+- It initializes the `QueryHelper` in the `InitQueryHelper()` function by creating a catalog manager to the SystemIndex catalog.
+- The metadata is initialized within the query helper, such as the number of results to retrive, the type of information to retrieve for each file (currently we retrieve the item URL, the file name and the file attributes).
+- The query helper matches results using the name of the file only and they are sorted by the last modified date, ensuring that the recently modified files are ranked higher.
+- The File attributes are utilized to filter out hidden files from being displayed.
+
+### Additional Information
+- There are two major types of queries generated by the indexer plugin:
+ 1. Full Text predicates - eg: [CONTAINS][Contains]
+ 2. Non-Full Text predicates - eg: [LIKE][Like]
+- The Full text predicates are much faster than non-full text predicates as they are based on finding matches rather than comparing the query with each item in the indexer database. Hence, queries which have the `CONTAINS` keyword are much faster than those which contain the `LIKE` keyword.
+- To prevent the indexer query from taking a long time and blocking the UI thread, there are two types of indexer queries which are executed. A simplified query and a full query, without and with the `LIKE` keyword respectively.
+- The result list is updated with the results of the full query once they are obtained.
+
+### Score
+Each of the indexer plugin results has a score set to 0 so they are present at the bottom of the list.
+
+[OLEDBCommand]: https://docs.microsoft.com/en-us/dotnet/api/system.data.oledb.oledbcommand?view=dotnet-plat-ext-3.1
+[OLEDBConnection]: https://docs.microsoft.com/en-us/dotnet/api/system.data.oledb.oledbconnection?view=dotnet-plat-ext-3.1
+[Contains]: https://docs.microsoft.com/en-us/windows/win32/search/-search-sql-contains
+[Like]: https://docs.microsoft.com/en-us/windows/win32/search/-search-sql-like
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/plugins/overview.md b/doc/devdocs/modules/launcher/plugins/overview.md
new file mode 100644
index 0000000000..ea6233c6c4
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/overview.md
@@ -0,0 +1,35 @@
+# Structural Overview
+The following basic functions are common to each of the plugins. They perform some rudimentary operations such as initialization of the plugin, executing the query that has been entered, loading context menu icons, updating settings when configurations are altered in the settings UI, and updating the theme of the icons when the theme changed event is triggered.
+
+## IPlugin Interface
+Each plugin implements the `IPlugin` interface which comprises of the `Init()` and `Query()` functions.
+
+### `Init`
+- The `Init()` function initializes the context, storage and settings of each plugin. This is equivalent to a contructor and is the first function to be called in the `Main.cs` file for each plugin.
+
+### `Query`
+- For every query that the user enters into PT Run, the `PluginManager.cs` executes the `Query()` function in the `Main.cs` file corresponding to each Plugin.
+
+### Context Menu Icons
+- The `ContextMenus` are loaded for each result based on the type of the result.
+- The various types of `ContextMenu` functionalities are:
+ - Open containing folder
+ - Run as Administrator
+ - Open in console
+ - Copy path
+
+### UpdateSettings
+- This function updates the settings of each plugin based on the changes made by the user in the settings UI.
+- Eg: To disable drive detection in the indexer plugin, when the user checks or unchecks the drive detection check box, the `UpdateSettings()` function dispatches the changes in the check box to the plugin.
+
+### ThemeChanged
+- This function is invoked when there is a change in the theme of PT Run.
+- It is used to update the `IconPath` for each plugin based on the theme.
+
+### Save
+- This function saves the configurations of each plugin so that they can be loaded the next time.
+
+### Score
+- The user query is executed against each of the plugins and the result list view is updated with results from each of the plugins.
+- The ordering of the results is based on the `Score` of each Result.
+- Each plugin assigns a score to a result based on it's relevance. The results with higher scores are displayed higher in the list view and vice versa.
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/plugins/program.md b/doc/devdocs/modules/launcher/plugins/program.md
new file mode 100644
index 0000000000..80eb221797
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/program.md
@@ -0,0 +1,43 @@
+# Program Plugin
+The program plugin as the name suggests is used to search for programs installed on the system.
+
+
+
+There are broadly two different categories of applications:
+
+1. Packaged applications
+2. Win32 applications
+
+### [UWP](src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs)
+- The logic for indexing Packaged applications is present within the [`UWP.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs) file.
+- There can be multiple applications present within a package. The [`UWPApplication.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWPApplication.cs) file encapsulates the properties of a packaged application.
+- To index packaged applications, the `PackageManager` retrives all the packages for the current user and indexes all the applications.
+- To retrieve the app icon for packaged applications, the assets path is retrieved from the `Application Manifest` file. There are multiple icons corresponding to each scale, target size and theme. The best icon is chosen given the theme of powerToys Run.
+
+### [Win32Program](src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/Win32Program.cs)
+- Win32 programs in the following locations are indexed by PT Run-
+ 1. Desktop
+ 2. Public Desktop (Applications present on the desktop of all the users)
+ 3. Registry (Some programs)
+ 4. Start Menu
+ 5. Common start menu (Applications which are common to all users)
+ 8. Locations pointed to by the PATH environment variable.
+- To prevent applications and shortcuts present in multiple locations from showing up as duplicate results, we consider apps with the same name, executable name and full path to be the same.
+- The subtitle of the application result is set based on it's application type. It could be one of the following:
+ 1. Lnk Shortcuts
+ 2. Appref files
+ 3. Internet shortcut - steam and epic games
+ 4. PWAs
+ 5. Run commands - these are indexed by the PATH environment variable
+
+### Score
+- The score for each application result is based on the how many letters are matched, how close the matched letters are to the actual word and the index of the matched characters.
+- There is a threshold score to decide the apps which are to be displayed and applications which have a lower score are not displayed by PT Run.
+
+### Update Program List in Runtime
+- Packaged and Win32 app helpers exist to reflect changes in the list of indexed apps when applications are installed on the system while PT Run is executing.
+- Packaged applications trigger events when the package is being installed and uninstalled. PT Run listens to those events to index applications which are newly installed or to delete an app which no longer exists from the database.
+- No such events exist for Win32 applications. We therefore use FileSystem Watchers to monitor the locations that we index for newly created, deleted or renamed application files and update the indexed Win32 catalog accordingly.
+
+### Additional Notes
+- Arguments can be provided to the program plugin by entering them after `--` (a double dash).
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/plugins/shell.md b/doc/devdocs/modules/launcher/plugins/shell.md
new file mode 100644
index 0000000000..1b9b5b4672
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/shell.md
@@ -0,0 +1,14 @@
+# Shell Plugin
+- Shell plugin emulates the Windows Run Prompt (Win+R).
+- Shell Plugin is one of the non-global plugins which has an action keyword set to `>`.
+
+
+
+### Functionality
+- The Shell command expands environment variables, so `>%appdata%` works as expected.
+- On inheriting the Shell plugin from Wox, there are three different ways of executing a command, using the command prompt, powershell or the run prompt. To uphold the name of PT Run, the Shell plugin always executes commands as the Run prompt would.
+- The Shell plugin has a concept of history where the previously executed commands show up in the drop down list along with the number of times they have been executed.
+- The Run prompt has the folder plugin function where we can navigate to different locations and entering the path to a directory displays all the sub-directories. To prevent reimplementing this logic, the shell plugin references the folder plugin to implement this functionality.
+
+### Score
+The Shell plugin results have a very high score of 5000. Hence, they are one of the first results in the list.
diff --git a/doc/devdocs/modules/launcher/plugins/uri.md b/doc/devdocs/modules/launcher/plugins/uri.md
new file mode 100644
index 0000000000..dec3362729
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/uri.md
@@ -0,0 +1,19 @@
+# URI Plugin
+The URI Plugin, as the name suggests is used to dierctly run the URI that has been entered by the user as a query. This is done by parsing the entry and validating the URI, followed by executing it.
+
+
+
+### [`URI Parser`](src/modules/launcher/Plugins/Microsoft.Plugin.Uri/UriHelper/ExtendedUriParser.cs)
+- The [`ExtendedUriParser.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Uri/UriHelper/ExtendedUriParser.cs) file tries to parse the user input and returns a `System.Uri` result by using the `UriBuilder`.
+- It also captures other cases which the UriBuilder does not handle such as when the input ends with a `:`, `.` or `:/`.
+
+### [`URI Resolver`](src/modules/launcher/Plugins/Microsoft.Plugin.Uri/UriHelper/UriResolver.cs)
+- The [`UriResolver.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.Uri/UriHelper/UriResolver.cs) file returns true for Valid hosts.
+- Currently there is no additional logic for filtering out invalid hosts and it always returns true for a valid Uri that was created by parsing the user query. It can be expanded in the future to filter out certain hosts.
+
+### Default Browser Icon
+- The icon for each uri result is that of the default browser set by the user.
+- These details are obtained from the user registry and updated each time the theme of PT Run is changed.
+
+### Score
+- All uri plugin results have a score of 0 which indicates that they would show up after each of the other plugins, other than the indexer plugin which also has a score of 0.
diff --git a/doc/devdocs/modules/launcher/plugins/windowwalker.md b/doc/devdocs/modules/launcher/plugins/windowwalker.md
new file mode 100644
index 0000000000..401cfa307a
--- /dev/null
+++ b/doc/devdocs/modules/launcher/plugins/windowwalker.md
@@ -0,0 +1,18 @@
+# Window Walker plugin
+The window walker plugin matches the user entered query with the open windows on the system.
+
+
+
+### [`OpenWindows.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs)
+- The window walker plugin uses the `EnumWindows` function to enumerate all the open windows in the [`OpenWindows.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/OpenWindows.cs) class.
+
+
+### [`SearchController.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchController.cs)
+- The [`SearchController`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/SearchController.cs) encapsulates the functions needed to search and find matches.
+- It is responsible for updating the search text and performing a fuzzy search on all the open windows in an asynchronous manner.
+
+### [`Window.cs`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs)
+- The [`Window`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/Window.cs) class represents a specific window and has functions to get the name of the process, the state of the window (whether it is visible or not), and the `SwitchTowindow` function which switches the desktop focus to the selected window. This action is performed when the user clicks on a window walker plugin result.
+
+### Score
+The window walker plugin uses [`FuzzyMatching`](src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/Components/FuzzyMatching.cs) to get the matching indices and calculates the score by creating a 2 dimensional array of the window and the query text.
diff --git a/doc/devdocs/modules/launcher/project_structure.md b/doc/devdocs/modules/launcher/project_structure.md
new file mode 100644
index 0000000000..b76976d5c5
--- /dev/null
+++ b/doc/devdocs/modules/launcher/project_structure.md
@@ -0,0 +1,24 @@
+# Project Structure
+## Overview
+`PowerToys Run` is divided across several projects to keep a logical separation between plugins and core functionality. The following sections provide a brief overview of each project.
+
+
+Fig 1. Project along with their dependencies in `PowerToys Run` ecosystem.
+
+## Project Description
+#### [`PowerLauncher`](/src/modules/launcher/PowerLauncher)
+This is the startup project for the `PowerToys Run.` It is a WPF desktop application and follows the `Model-View-ViewModel (MVVM)` design pattern. Plugins play the role of `Model` and provide data to `ViewModel.`
+
+#### [`PowerLauncher.Telemetry`](/src/modules/launcher/PowerLauncher.Telemetry)
+[`PowerLauncher.Telemetry`](/src/modules/launcher/PowerLauncher.Telemetry) is a .net core project that contains telemetry events generated by `PowerLauncher.` These events have been discussed in detail [here](/doc/devdocs/modules/launcher/telemetry.md).
+
+#### [`Wox.Core`](/src/modules/launcher/Wox.Core)
+[`Wox.Core`](/src/modules/launcher/Wox.Core) is a .net core project that contains helper classes required by the `PowerLauncher` project. Two major functionalities encapsulated in this project are [`PluginManager`](/src/modules/launcher/Wox.Core/Plugin/PluginManager.cs) and [`Query Builder.`](/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs) [`PluginManager`](/src/modules/launcher/Wox.Core/Plugin/PluginManager.cs) provides an interface for managing C# plugins. [`Query Builder.`](/src/modules/launcher/Wox.Core/Plugin/QueryBuilder.cs) decimate user-typed query string and creates a [`Query`](/src/modules/launcher/Wox.Plugin/Query.cs) object. [`Query`](/src/modules/launcher/Wox.Plugin/Query.cs) object contains the action keyword and cleaned query, which is then sent to all plugins.
+
+#### [`Wox.Infrastructure`](/src/modules/launcher/Wox.Infrastructure)
+[`Wox.Infrastructure`](/src/modules/launcher/Wox.Infrastructure) is a .net core project that contains helper classes required for logging, image manipulation, and storage by the `PowerLauncher` project and the plugins. [`ImageLoader.cs`](/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs) class is used to load icons for `Win32` program. It also provides caching functionality to speed up image loading for frequently queried programs. [`Log.cs`](/src/modules/launcher/Wox.Infrastructure/Logger/Log.cs) provides an abstraction for logging error, information, and output to text files. These files are stored at `%userprofile%/appdata/local/microsoft/powertoys/powertoys run/Logs.`
+
+#### [`Wox.Plugin`](/src/modules/launcher/Wox.Plugin)
+[`Wox.Plugin`](/src/modules/launcher/Wox.Plugin) contains interfaces that facilitate communication between `PowerLauncher` and plugins. These interfaces have been discussed in detail [here](/doc/devdocs/modules/launcher/architecture.md#flow-of-data-between-viewmodels-and-pluginsmodel).
+
+
diff --git a/doc/devdocs/modules/launcher/readme.md b/doc/devdocs/modules/launcher/readme.md
new file mode 100644
index 0000000000..2267b8b688
--- /dev/null
+++ b/doc/devdocs/modules/launcher/readme.md
@@ -0,0 +1,14 @@
+# Table of Contents
+1. [Architecture](/doc/devdocs/modules/launcher/architecture.md)
+2. [Debugging](/doc/devdocs/modules/launcher/debugging.md)
+3. [Project Structure](/doc/devdocs/modules/launcher/project_structure.md)
+4. [Telemetry](/doc/devdocs/modules/launcher/telemetry.md)
+5. Plugins
+ - [Overview](/doc/devdocs/modules/launcher/plugins/overview.md)
+ - [Calculator](/doc/devdocs/modules/launcher/plugins/calculator.md)
+ - [Folder](/doc/devdocs/modules/launcher/plugins/folder.md)
+ - [Indexer](/doc/devdocs/modules/launcher/plugins/indexer.md)
+ - [Program](/doc/devdocs/modules/launcher/plugins/program.md)
+ - [Shell](/doc/devdocs/modules/launcher/plugins/shell.md)
+ - [Uri](/doc/devdocs/modules/launcher/plugins/uri.md)
+ - [Window Walker](/doc/devdocs/modules/launcher/plugins/windowwalker.md)
\ No newline at end of file
diff --git a/doc/devdocs/modules/launcher/telemetry.md b/doc/devdocs/modules/launcher/telemetry.md
new file mode 100644
index 0000000000..3e0c233517
--- /dev/null
+++ b/doc/devdocs/modules/launcher/telemetry.md
@@ -0,0 +1,14 @@
+# Telemetry
+## Overview
+`PowerLauncher.Telemetry` project contains telemetry events generated by `PowerToys Run.` These event classes are derived from the [`EventBase`](/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs) class and [`IEvent`](/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs) class. [`IEvent`](/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs) class provides the lowest level abstraction, containing attributes such as privacy tags needed for every telemetry data. [`EventBase`](/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs) class provides a higher-level abstraction, having attributes common to all `PowerToys` telemetry events.
+
+## Events
+The following events are generated by `PowerLauncher`:
+1. [`LauncherBootEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherBootEvent.cs): This event captures the time taken by `PowerLauncher` to load all plugins, perform cold start, and setup UI environment.
+2. [`LauncherHideEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherHideEvent.cs): This event is generated when the `PowerLauncher` window is hidden.
+3. [`LauncherColdStateHotkeyEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherColdStateHotkeyEvent.cs): This event logs time from the first Alt+Space press till the `PowerLauncher` window is visible.
+4. [`LauncherFirstDeleteEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherFirstDeleteEvent.cs): This event is generated after the first delete is pressed after `PowerLauncher` is visible.
+5. [`LauncherQueryEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherQueryEvent.cs): This event is generated for every query that is typed in the searchbox. It logs query time, number of results, and query length.
+6. [`LauncherResultActionEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherResultActionEvent.cs): This event is generated when a context menu action is triggered.
+7. [`LauncherShowEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherShowEvent.cs): This event is generated when the `PowerLauncher` window is shown.
+8. [`LauncherWarmStateHotkeyEvent`](/src/modules/launcher/PowerLauncher.Telemetry/Events/LauncherWarmStateHotkeyEvent.cs): This event logs time from the Alt+Space press until the PT Run window is visible.
\ No newline at end of file
diff --git a/doc/devdocs/settingsv2/communication-with-modules.md b/doc/devdocs/settingsv2/communication-with-modules.md
new file mode 100644
index 0000000000..d857e36936
--- /dev/null
+++ b/doc/devdocs/settingsv2/communication-with-modules.md
@@ -0,0 +1,15 @@
+# Communication with modules
+
+## Through runner
+- The settings process communicates changes in the UI to most modules using the runner through delegates.
+- More details on this are mentioned in [`runner-ipc.md`](settingsv2/runner-ipc.md).
+
+## PT Run
+- Any changes to the UI are saved by the settings process in the `settings.json` file located within the `/Local/Microsoft/PowerToys/Launcher/` folder.
+- PT Run watches for any changes within this file and updates it's general settings or propagates the information to the plugins, depending on the type of information.
+Eg: The maximum number of results drop down updates the maximum number of rows in the results list which updates the general settings of PT Run whereas the drive detection checkbox details are dispatched to the indexer plugin.
+
+## Keyboard Manager
+- The Settings process and keyboard manager share access to a common `default.json` file which contains information about the remapped keys and shortcuts.
+- To ensure that there is no contention while both processes try to access the common file, there is a named file mutex.
+- The settings process expects the keyboard manager process to create the `default.json` file if it does not exist. It does not create the file in case it is not present.
\ No newline at end of file
diff --git a/doc/devdocs/settingsv2/compatibility-legacy-settings.md b/doc/devdocs/settingsv2/compatibility-legacy-settings.md
new file mode 100644
index 0000000000..de79458954
--- /dev/null
+++ b/doc/devdocs/settingsv2/compatibility-legacy-settings.md
@@ -0,0 +1,12 @@
+# Compatibility with legacy settings and runner
+The following must be kept in mind regarding compatibility with settings v1 and runner.
+
+### 1. Folder Naming structure
+- Each of the modules has a folder within the `Local/Microsoft/PowerToys` directory which contains the module configurations within the `settings.json` file. The name of this folder must be the same across settingsv1 and settingsv2.
+- The name of the settings folder for each powertoy is the same as the `ModuleName`. It is set within each of the viewModel files. This name must not be changed to ensure that the user configurations for each of the powertoys rolls over on update.
+
+### 2. Communication with runner
+- The status of each of the modules is communicated with the runner in the form of a json object. The names of all the powerToys is set in the [`EnableModules.cs`](src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs) file. The `JsonPropertyName` must not be changed to ensure that the information is dispatched properly to all the modules by the runner.
+
+### ImageResizer anomaly
+All the powertoys have the same folder name as well as JsonPropertyName to communicate information with the runner. However that is not the case with ImageResizer. The folder name is `ImageResizer` whereas the JsonPropertyName is `Image Resizer`(Note the additional space). This should not be changed to ensure backward compatibity as well as proper functioning of the module.
\ No newline at end of file
diff --git a/doc/devdocs/settingsv2/hotkeycontrol.md b/doc/devdocs/settingsv2/hotkeycontrol.md
new file mode 100644
index 0000000000..ed6da82822
--- /dev/null
+++ b/doc/devdocs/settingsv2/hotkeycontrol.md
@@ -0,0 +1,46 @@
+# Custom HotKey Control
+
+The Settings project provides a custom hotkey control which consumes key presses. This control can be used to set the hotkey of any PowerToy.
+
+## HotKey Control in FancyZones
+
+
+## Hotkey related files
+
+#### [`HotkeySettingsControlHook.cs`](/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs)
+
+- This function initializes and starts the [`keyboardHook`](src/common/interop/KeyboardHook.cpp) for the hotkey control.
+
+```csharp
+ public HotkeySettingsControlHook(KeyEvent keyDown, KeyEvent keyUp, IsActive isActive, FilterAccessibleKeyboardEvents filterAccessibleKeyboardEvents)
+ {
+ _keyDown = keyDown;
+ _keyUp = keyUp;
+ _isActive = isActive;
+ _filterKeyboardEvent = filterAccessibleKeyboardEvents;
+ _hook = new KeyboardHook(HotkeySettingsHookCallback, IsActive, FilterKeyboardEvents);
+ _hook.Start();
+ }
+
+```
+
+#### [`HotkeySettingsControl.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI/HotkeySettingsControl.xaml.cs)
+
+- The function of this class is to update the state of the keys being pressed within the custom control. This information is stored in `internalSettings`.
+
+- It provides the following callbacks to the `HotKeySettingsControlHook`:
+
+ - `KeyUp`: Resets the key state in `internalSettings` when a key is released.
+ - `KeyDown`: Updates the user facing text of the hotkey control as soon as a key is pressed.
+ - `isActive`: Sets the current status of the keyboard hook.
+ - `FilterAccessibleKeyboardEvents`: This function is used to ignore the `Tab` and `Shift+Tab` key presses to meet the accessibility requirements.
+
+#### [`HotkeySettings.cs`](/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs)
+
+- Contains the structure of a HotKey where it is represented as a combination of one of the modifier keys (`Alt`, `Shift`, `Win` and `Ctrl`) and a non-modifier key.
+
+#### Note
+- The control displays all key presses to the user (except Tab and Shift+Tab which move focus out of the control). However, when the focus is being lost from the control, the `lastValidHotkeySettings` is set as the user facing text.
+
+
+
diff --git a/doc/devdocs/settingsv2/project-overview.md b/doc/devdocs/settingsv2/project-overview.md
new file mode 100644
index 0000000000..f606942f85
--- /dev/null
+++ b/doc/devdocs/settingsv2/project-overview.md
@@ -0,0 +1,17 @@
+# Overview
+`Settingsv2` is WPF .net core desktop application. It uses the `WindowsXamlHost` control from the Windows Community Toolkit to host UWP controls from `WinUI3` library. More details about WinUI can be found [here](https://microsoft.github.io/microsoft-ui-xaml/about.html#what-is-it).
+
+## Settings V2 Project structure
+The Settings project is a XAML island based project which
+follows the [MVVM architectural pattern][MVVM] where the graphical user interface is separated from the view models.
+
+#### [UI Components:](/src/core/Microsoft.PowerToys.Settings.UI)
+The Settings.UI project contains the xaml files for each of the UI components. It also contains the Hotkey logic for the settings control.
+
+#### [Viewmodels:](/src/core/Microsoft.PowerToys.Settings.UI.Library)
+The Settings.UI.Library project contains the data that is to be rendered by the UI components.
+
+#### [Settings Runner:](/src/core/Microsoft.PowerToys.Settings.UI.Runner)
+The function of the settings runner project is to communicate all changes that the user makes in the user interface, to the runner so that it can be dispatched and reflected in all the modules.
+
+[MVVM]: https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-and-mvvm
\ No newline at end of file
diff --git a/doc/devdocs/settingsv2/readme.md b/doc/devdocs/settingsv2/readme.md
new file mode 100644
index 0000000000..c9cb7945be
--- /dev/null
+++ b/doc/devdocs/settingsv2/readme.md
@@ -0,0 +1,12 @@
+# Table of Contents
+1. [Settings overview](/doc/devdocs/settingsv2/project-overview.md)
+2. [UI Architecture](/doc/devdocs/settingsv2/ui-architecture.md)
+3. [ViewModels](/doc/devdocs/settingsv2/viewmodels.md)
+4. Data flow
+ - [Inter-Process Communication with runner](/doc/devdocs/settingsv2/runner-ipc.md)
+ - [Communication with modules](/doc/devdocs/settingsv2/communication-with-modules.md)
+5. [Settings Utilities](/doc/devdocs/settingsv2/settings-utilities.md)
+6. [Custom Hotkey control and keyboard hook handling](hotkeycontrol.md)
+7. [Compatibility with legacy settings and runner](/doc/devdocs/settingsv2/compatibility-legacy-settings.md)
+8. [XAML Island tweaks](/doc/devdocs/settingsv2/xaml-island-tweaks.md)
+9. [Telemetry](/doc/devdocs/settingsv2/telemetry.md)
diff --git a/doc/devdocs/settingsv2/runner-ipc.md b/doc/devdocs/settingsv2/runner-ipc.md
new file mode 100644
index 0000000000..d10dcd7848
--- /dev/null
+++ b/doc/devdocs/settingsv2/runner-ipc.md
@@ -0,0 +1,46 @@
+# Inter-Process Communication with Runner
+
+The Settings v2 process uses two way IPC to communicate with the runner process.
+
+## Initialization
+- On the settings' side, the two way IPC delegates are contained with the [`ShellPage.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs) file. The delegates are static and the views for all the powerToys send the ipc information to the viewmodels as `ShellPage.DefaultSndMSGCallBack`.
+- These delegates are initialized within the [`Mainwindow.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs) file in the `Settings.Runner` project.
+
+
+## Types of IPC delegates
+- There are three types of delegates for the settings to communicate with the runner:
+1. `SendDefaultMessage` - This is used by all the viewmodels to communicate changes in the UI to the runner so that the information can be dispatched to the modules.
+2. `RestartAsAdmin`
+3. `CheckForUpdates`
+
+## Sending information to runner
+- The settings process communicates with the runner by using the delegates defined within the [`ShellPage.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs) file.
+- Depending on the type of object sending the information, the json is created accordingly.
+- If any information has been modified by the user in the GeneralSettings page, then the json file sent to the runner has the name set to `general`, whereas if any information has been modified by the user in any powertoy related settings page, the name of the json file being communicated with the runner is set to `powertoy`.
+
+## Receiving information from runner
+- The `ShellPage`object has a `IPCResponseHandleList` which is a list of functions which handle IPC responses.
+
+```csharp
+// receive IPC Message
+Program.IPCMessageReceivedCallback = (string msg) =>
+{
+ if (ShellPage.ShellHandler.IPCResponseHandleList != null)
+ {
+ try
+ {
+ JsonObject json = JsonObject.Parse(msg);
+ foreach (Action handle in ShellPage.ShellHandler.IPCResponseHandleList)
+ {
+ handle(json);
+ }
+ }
+ catch (Exception)
+ {
+ }
+ }
+};
+```
+
+- Whenever any information is sent from the runner each of the functions in the handle list perform their action on that json object.
+- One example of where information sent from the runner is being processed by the settings is in [`GeneralPage.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs) when the user clicks the check for updates button. The information displayed after, such as the user has the latest version installed is a result of this handle.
diff --git a/doc/devdocs/settingsv2/settings-utilities.md b/doc/devdocs/settingsv2/settings-utilities.md
new file mode 100644
index 0000000000..545e0f8679
--- /dev/null
+++ b/doc/devdocs/settingsv2/settings-utilities.md
@@ -0,0 +1,13 @@
+# Settings Utilities
+
+- Abstractions for each of the file/folder related operations are present in [`SettingsUtils.cs`](src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs).
+- To reduce contention between the settings process and runner while trying to access the `settings.json` file of any powertoy, the settings process tries to access the file only when it needs to load the information for the first time. However, there is still no mechanism in place which ensures that both the settings and runner processes do not access the information simultaneously leading to `IOExceptions`.
+
+## Utilities
+
+### `GetSettings(powertoy, filename)`
+
+- The GetSettings function tries to read the file in the powertoy settings folder and creates a new file with default configurations if it does not exist.
+- Ideally this function should only be called by the [`SettingsRepository`](src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs) which would be accessed only when a powertoy settings object is being loaded for the first time.
+- The reason behind ensuring that it is not accessed elsewhere is to avoid contention with the runner during file access.
+- Each of the objects which are deserialized using this function must implement the `ISettingsConfig` interface.
diff --git a/doc/devdocs/settingsv2/telemetry.md b/doc/devdocs/settingsv2/telemetry.md
new file mode 100644
index 0000000000..02413e3a3d
--- /dev/null
+++ b/doc/devdocs/settingsv2/telemetry.md
@@ -0,0 +1,8 @@
+# Telemetry
+## Overview
+[`Microsoft.PowerToys.Settings.UI.Library/Telemetry`](/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry) contains telemetry events generated by `Settingsv2.` These event classes are derived from the [`EventBase`](/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs) class and [`IEvent`](/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs) class. [`IEvent`](/src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs) class provides the lowest level abstraction, containing attributes such as privacy tags needed for every telemetry data. [`EventBase`](/src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs) class provides a higher-level abstraction, having attributes common to all `PowerToys` telemetry events.
+
+## Events
+The following events are generated by `Settingsv2`:
+1. [`SettingsBootEvent`](/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsBootEvent.cs): This event captures the time taken by `Settingsv2` to initialize `MainWindow` UI control.
+2. [`SettingsEnabledEvent.cs`](/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsEnabledEvent.cs): This event is generated when a module is enabled or disabled.
\ No newline at end of file
diff --git a/doc/devdocs/settingsv2/ui-architecture.md b/doc/devdocs/settingsv2/ui-architecture.md
new file mode 100644
index 0000000000..d64077dfd0
--- /dev/null
+++ b/doc/devdocs/settingsv2/ui-architecture.md
@@ -0,0 +1,9 @@
+# UI Architecture
+
+ The UI code is distributed between two projects: [`Microsoft.PowerToys.Settings.UI.Runner`](/src/core/Microsoft.PowerToys.Settings.UI.Runner) and [`Microsoft.PowerToys.Settings.UI`](/src/core/Microsoft.PowerToys.Settings.UI.Library). [`Microsoft.PowerToys.Settings.UI.Runner`](/src/core/Microsoft.PowerToys.Settings.UI.Runner) is a WPF .net core application. It contains the parent display window and corresponding code is present in [`MainWindow.xaml.`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml) [`Microsoft.PowerToys.Settings.UI`](/src/core/Microsoft.PowerToys.Settings.UI.Library) is UWP applications and contains views for base navigation and modules. Fig 1 provides a description of the UI controls hierarchy and each of the controls have been summarized below :
+- [`MainWindow.xaml`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml) is the parent WPF control.
+- `WindowsXamlHost` control is used to host UWP control to [`MainWindow.xaml`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml) parent control.
+- [`ShellPage.xaml`](/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml) is a UWP control, consisting of a side navigation panel with an icon for each module. Clicking on a module icon loads the corresponding `setting.json` file and displays the data in the UI.
+
+
+**Fig 1: UI Architecture for settingsv2**
diff --git a/doc/devdocs/settingsv2/viewmodels.md b/doc/devdocs/settingsv2/viewmodels.md
new file mode 100644
index 0000000000..351f3211ff
--- /dev/null
+++ b/doc/devdocs/settingsv2/viewmodels.md
@@ -0,0 +1,26 @@
+# Viewmodels
+The viewmodels are located within the [`Microsoft.PowerToys.Settings.UI.Library`](/src/core/Microsoft.PowerToys.Settings.UI.Library) project.
+
+## Components
+- Each viewmodel takes in the general `settingsRepository`, the `moduleSettingsRepository` if it exists and the delegates for IPC communication.
+- The general `settingsRepository` contains the general configurations of all powertoys whereas the `moduleSettingsRepository` is spcific to the module. This is to ensure that the configuration details are shared amongst the viewmodels without having to re-open the `settings.json` file.
+- Whenever there is a change in the UI, the `OnPropertyChanged` event is invoked and the viewmodel sends a corresponding IPC message to the runner which would perform the designated action such as dispatching the change to the modules or enabling/disabling the powertoy etc.
+
+#### Difference between viewmodels
+- The [`GeneralViewModel`](/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs) is different from the rest of the view models with regard to the IPC communication wherein it sends special IPC messages to the runner to check for updates and to restart as admin.
+- Each of the powerToy viewmodels have two types of IPC communications, one for the general status of the powerToy and the other for communication powerToy specific change in properties to the runner.
+
+## [`SettingsRepository`](src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs)
+- The [`SettingsRepository`](src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs) is a generic singleton which contains the configurations for each viewmodel.
+- As it is a generic singleton, there can only be one instance of the settings repository of a particular type. This ensures that all the viewmodels are modifying a common object and a change made in one locations reflects everywhere.
+- The singleton implementation is thread-safe. Unit tests have been added for the same.
+
+### Settings viewmodel anomalies
+- The reason behind using the `SettingsRepository` is to ensure that the settings process does not try to access the `settings.json` files directly but rather does it through this class which encapsulates all the file operations from the viewmodels.
+- However, this could not be expanded to all the viewmodels directly for the following reasons. Some refactoring must be done to unify these cases and to bring them under the same model:
+ - The PowerRename viewodel does not save the settings configurations in the same format as the rest of the powertoys, ie. {name, version, properties}. However, it only stores the properties directly.
+ - Some viewmodels expect the runner to create the file instead of creating the file themselves, like in keyboard manager.
+ - The colorpicker powertoy creates the `settings.json` within the module. This must be taken care of when encapsulated within the settingsRepository.
+- Currently, all modules use the `SettingsRepository` to access the General Settings config.
+- However, only Fancyzones, ShortcutGuide and PowerPreview use the `SettingsRepository` to access the module properties.
+
diff --git a/doc/devdocs/settingsv2/xaml-island-tweaks.md b/doc/devdocs/settingsv2/xaml-island-tweaks.md
new file mode 100644
index 0000000000..e0b134b4f3
--- /dev/null
+++ b/doc/devdocs/settingsv2/xaml-island-tweaks.md
@@ -0,0 +1,30 @@
+# XAML Island Tweaks
+Few tweaks were made to fix issues with Xaml Islands. These tweaks should be removed after migrating to WINUI3. The tweaks are listed below:
+1. Workaround to ensure XAML Island application terminates if attempted to close from taskbar while minimized:
+```
+private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+{
+ isOpen = false;
+
+ // XAML Islands: If the window is closed while minimized, exit the process. Required to avoid process not terminating issue - https://github.com/microsoft/PowerToys/issues/4430
+ if (WindowState == WindowState.Minimized)
+ {
+ // Run Environment.Exit on a separate task to avoid performance impact
+ System.Threading.Tasks.Task.Run(() => { Environment.Exit(0); });
+ }
+}
+```
+2. Workaround to hide the XAML Island blank icon in the taskbar when the XAML Island application is loading:
+```
+var coreWindow = Windows.UI.Core.CoreWindow.GetForCurrentThread();
+var coreWindowInterop = Interop.GetInterop(coreWindow);
+Interop.ShowWindow(coreWindowInterop.WindowHandle, Interop.SW_HIDE);
+```
+3. Workaround to prevent XAML Island failing to render on Nvidia workstation graphics cards:
+```
+ // XAML Islands: If the window is open, explicity force it to be shown to solve the blank dialog issue https://github.com/microsoft/PowerToys/issues/3384
+ if (isOpen)
+ {
+ Show();
+ }
+ ```
\ No newline at end of file
diff --git a/doc/images/launcher/launcher_dependency.PNG b/doc/images/launcher/launcher_dependency.PNG
new file mode 100644
index 0000000000..dd28b85b0d
Binary files /dev/null and b/doc/images/launcher/launcher_dependency.PNG differ
diff --git a/doc/images/launcher/plugins/calculator.png b/doc/images/launcher/plugins/calculator.png
new file mode 100644
index 0000000000..7d88107774
Binary files /dev/null and b/doc/images/launcher/plugins/calculator.png differ
diff --git a/doc/images/launcher/plugins/folder.png b/doc/images/launcher/plugins/folder.png
new file mode 100644
index 0000000000..ae707b1e22
Binary files /dev/null and b/doc/images/launcher/plugins/folder.png differ
diff --git a/doc/images/launcher/plugins/indexer.png b/doc/images/launcher/plugins/indexer.png
new file mode 100644
index 0000000000..a4f7bbf9f0
Binary files /dev/null and b/doc/images/launcher/plugins/indexer.png differ
diff --git a/doc/images/launcher/plugins/program.png b/doc/images/launcher/plugins/program.png
new file mode 100644
index 0000000000..a7583088b8
Binary files /dev/null and b/doc/images/launcher/plugins/program.png differ
diff --git a/doc/images/launcher/plugins/shell.png b/doc/images/launcher/plugins/shell.png
new file mode 100644
index 0000000000..556e82045a
Binary files /dev/null and b/doc/images/launcher/plugins/shell.png differ
diff --git a/doc/images/launcher/plugins/uri.png b/doc/images/launcher/plugins/uri.png
new file mode 100644
index 0000000000..b990a724f0
Binary files /dev/null and b/doc/images/launcher/plugins/uri.png differ
diff --git a/doc/images/launcher/plugins/windowwalker.png b/doc/images/launcher/plugins/windowwalker.png
new file mode 100644
index 0000000000..cd1368f56a
Binary files /dev/null and b/doc/images/launcher/plugins/windowwalker.png differ
diff --git a/doc/images/launcher/pt_run_ui.png b/doc/images/launcher/pt_run_ui.png
new file mode 100644
index 0000000000..98be7138d4
Binary files /dev/null and b/doc/images/launcher/pt_run_ui.png differ
diff --git a/doc/images/launcher/ui_vm_interaction.PNG b/doc/images/launcher/ui_vm_interaction.PNG
new file mode 100644
index 0000000000..2aea3a6094
Binary files /dev/null and b/doc/images/launcher/ui_vm_interaction.PNG differ
diff --git a/doc/images/launcher/vm_plugin_interaction.PNG b/doc/images/launcher/vm_plugin_interaction.PNG
new file mode 100644
index 0000000000..2a00496bbd
Binary files /dev/null and b/doc/images/launcher/vm_plugin_interaction.PNG differ
diff --git a/doc/images/settingsv2/settingshotkeycontrol.png b/doc/images/settingsv2/settingshotkeycontrol.png
new file mode 100644
index 0000000000..efe8d1a954
Binary files /dev/null and b/doc/images/settingsv2/settingshotkeycontrol.png differ
diff --git a/doc/images/settingsv2/ui-architecture.png b/doc/images/settingsv2/ui-architecture.png
new file mode 100644
index 0000000000..d7a029f438
Binary files /dev/null and b/doc/images/settingsv2/ui-architecture.png differ
diff --git a/installer/PowerToysBootstrapper/PowerToysBootstrapper.sln b/installer/PowerToysBootstrapper/PowerToysBootstrapper.sln
index f935a035e8..119aa75d00 100644
--- a/installer/PowerToysBootstrapper/PowerToysBootstrapper.sln
+++ b/installer/PowerToysBootstrapper/PowerToysBootstrapper.sln
@@ -9,6 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\src\common\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bootstrapper", "bootstrapper\bootstrapper.vcxproj", "{D194E3AA-F824-4CA9-9A58-034DD6B7D022}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logging", "..\..\src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -27,6 +29,10 @@ Global
{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Debug|x64.Build.0 = Debug|x64
{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Release|x64.ActiveCfg = Release|x64
{D194E3AA-F824-4CA9-9A58-034DD6B7D022}.Release|x64.Build.0 = Release|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.ActiveCfg = Release|x64
+ {7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
index cc22f38b3d..2ab0c29cd5 100644
--- a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
+++ b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.cpp
@@ -10,16 +10,22 @@
#include
#include
-
#include
extern "C" IMAGE_DOS_HEADER __ImageBase;
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
namespace
{
const wchar_t APPLICATION_ID[] = L"PowerToysInstaller";
const wchar_t TOAST_TAG[] = L"PowerToysInstallerProgress";
+ const char LOG_FILENAME[] = "powertoys-bootstrapper-" STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_REVISION) ".log";
+ const char MSI_LOG_FILENAME[] = "powertoys-bootstrapper-msi-" STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_REVISION) ".log";
+
}
+#undef STR
+#undef STR_HELPER
namespace localized_strings
{
@@ -59,63 +65,129 @@ std::optional extractIcon()
return iconRes->saveAsFile(icoPath) ? std::make_optional(std::move(icoPath)) : std::nullopt;
}
-enum class CmdArgs
+void setup_log(fs::path directory, const spdlog::level::level_enum severity)
{
- silent,
- noFullUI,
- noStartPT,
- skipDotnetInstall,
- showHelp
-};
-
-namespace
-{
- const std::unordered_map knownArgs = {
- { L"--help", CmdArgs::showHelp },
- { L"--no_full_ui", CmdArgs::noFullUI },
- { L"--silent", CmdArgs::silent },
- { L"--no_start_pt", CmdArgs::noStartPT },
- { L"--skip_dotnet_install", CmdArgs::skipDotnetInstall }
- };
-}
-
-std::unordered_set parseCmdArgs(const int nCmdArgs, LPWSTR* argList)
-{
- std::unordered_set result;
- for (size_t i = 1; i < nCmdArgs; ++i)
+ try
{
- if (auto it = knownArgs.find(argList[i]); it != end(knownArgs))
+ std::shared_ptr logger;
+ if (severity != spdlog::level::off)
{
- result.emplace(it->second);
+ logger = spdlog::basic_logger_mt("file", (directory / LOG_FILENAME).string());
+
+ std::error_code _;
+ const DWORD msiSev = severity == spdlog::level::debug ? INSTALLLOGMODE_VERBOSE : INSTALLLOGMODE_ERROR;
+ const auto msiLogPath = directory / MSI_LOG_FILENAME;
+ MsiEnableLogW(msiSev, msiLogPath.c_str(), INSTALLLOGATTRIBUTES_APPEND);
}
+ else
+ {
+ logger = spdlog::null_logger_mt("null");
+ }
+ logger->set_pattern("[%L][%d-%m-%C-%T] %v");
+ logger->set_level(severity);
+ spdlog::set_default_logger(std::move(logger));
+ spdlog::set_level(severity);
+ spdlog::flush_every(std::chrono::seconds(5));
+ }
+ catch (...)
+ {
}
- return result;
}
int bootstrapper()
{
using namespace localized_strings;
winrt::init_apartment();
-
- int nCmdArgs = 0;
- LPWSTR* argList = CommandLineToArgvW(GetCommandLineW(), &nCmdArgs);
- const auto cmdArgs = parseCmdArgs(nCmdArgs, argList);
- std::wostringstream oss;
- if (cmdArgs.contains(CmdArgs::showHelp))
+ cxxopts::Options options{ "PowerToysBootstrapper" };
+ // clang-format off
+ options.add_options()
+ ("h,help", "Show help")
+ ("no_full_ui", "Use reduced UI for MSI")
+ ("s,silent", "Suppress MSI UI and notifications")
+ ("no_start_pt", "Do not launch PowerToys after the installation is complete")
+ ("skip_dotnet_install", "Skip dotnet 3.X installation even if it's not detected")
+ ("log_level", "Log level. Possible values: off|debug|error", cxxopts::value()->default_value("off"))
+ ("log_dir", "Log directory.", cxxopts::value()->default_value("."));
+ // clang-format on
+ cxxopts::ParseResult cmdArgs;
+ bool showHelp = false;
+ try
{
- oss << "Supported arguments:\n\n";
- for (auto [arg, _] : knownArgs)
- {
- oss << arg << '\n';
- }
- MessageBoxW(nullptr, oss.str().c_str(), L"Help", MB_OK | MB_ICONINFORMATION);
+ cmdArgs = options.parse(__argc, const_cast(__argv));
+ }
+ catch (cxxopts::option_has_no_value_exception&)
+ {
+ showHelp = true;
+ }
+ catch (cxxopts::option_not_exists_exception&)
+ {
+ showHelp = true;
+ }
+ catch (cxxopts::option_not_present_exception&)
+ {
+ showHelp = true;
+ }
+ catch (cxxopts::option_not_has_argument_exception&)
+ {
+ showHelp = true;
+ }
+ catch (cxxopts::option_required_exception&)
+ {
+ showHelp = true;
+ }
+ catch (cxxopts::option_requires_argument_exception&)
+ {
+ showHelp = true;
+ }
+ catch (...)
+ {
+ }
+
+ showHelp = showHelp || cmdArgs["help"].as();
+ if (showHelp)
+ {
+ std::ostringstream helpMsg;
+ helpMsg << options.help();
+ MessageBoxA(nullptr, helpMsg.str().c_str(), "Help", MB_OK | MB_ICONINFORMATION);
return 0;
}
- if (!cmdArgs.contains(CmdArgs::noFullUI))
+ const bool noFullUI = cmdArgs["no_full_ui"].as();
+ const bool silent = cmdArgs["silent"].as();
+ const bool skipDotnetInstall = cmdArgs["skip_dotnet_install"].as();
+ const bool noStartPT = cmdArgs["no_start_pt"].as();
+ const auto logLevel = cmdArgs["log_level"].as();
+ const auto logDirArg = cmdArgs["log_dir"].as();
+ spdlog::level::level_enum severity = spdlog::level::off;
+
+ fs::path logDir = ".";
+ try
+ {
+ fs::path logDirArgPath = logDirArg;
+ if (fs::exists(logDirArgPath) && fs::is_directory(logDirArgPath))
+ {
+ logDir = logDirArgPath;
+ }
+ }
+ catch (...)
+ {
+ }
+
+ if (logLevel == "debug")
+ {
+ severity = spdlog::level::debug;
+ }
+ else if (logLevel == "error")
+ {
+ severity = spdlog::level::err;
+ }
+ setup_log(logDir, severity);
+ spdlog::debug("PowerToys Bootstrapper is launched!\nnoFullUI: {}\nsilent: {}\nno_start_pt: {}\nskip_dotnet_install: {}\nlog_level: {}", noFullUI, silent, noStartPT, skipDotnetInstall, logLevel);
+
+ if (!noFullUI)
{
MsiSetInternalUI(INSTALLUILEVEL_FULL, nullptr);
}
- if (cmdArgs.contains(CmdArgs::silent))
+ if (silent)
{
if (is_process_elevated())
{
@@ -123,8 +195,12 @@ int bootstrapper()
}
else
{
- // MSI fails to run in silent mode due to a suppressed UAC w/o elevation, so we restart elevated
+ spdlog::debug("MSI doesn't support silent mode without elevation => restarting elevated");
+ // MSI fails to run in silent mode due to a suppressed UAC w/o elevation,
+ // so we restart ourselves elevated with the same args
std::wstring params;
+ int nCmdArgs = 0;
+ LPWSTR* argList = CommandLineToArgvW(GetCommandLineW(), &nCmdArgs);
for (int i = 1; i < nCmdArgs; ++i)
{
params += argList[i];
@@ -136,6 +212,7 @@ int bootstrapper()
const auto processHandle = run_elevated(argList[0], params.c_str());
if (!processHandle)
{
+ spdlog::error("Couldn't restart elevated to enable silent mode! ({})", GetLastError());
return 1;
}
if (WaitForSingleObject(processHandle, 3600000) == WAIT_OBJECT_0)
@@ -146,6 +223,7 @@ int bootstrapper()
}
else
{
+ spdlog::error("Elevated setup process timed out after 60m => using basic MSI UI ({})", GetLastError());
// Couldn't install using the completely silent mode in an hour, use basic UI.
TerminateProcess(processHandle, 0);
MsiSetInternalUI(INSTALLUILEVEL_BASIC, nullptr);
@@ -163,16 +241,17 @@ int bootstrapper()
auto instanceMutex = createAppMutex(POWERTOYS_BOOTSTRAPPER_MUTEX_NAME);
if (!instanceMutex)
{
+ spdlog::error("Couldn't acquire PowerToys global mutex. That means setup couldn't kill PowerToys.exe process");
return 1;
}
notifications::override_application_id(APPLICATION_ID);
-
+ spdlog::debug("Extracting icon for toast notifications");
fs::path iconPath{ L"C:\\" };
if (auto extractedIcon = extractIcon())
{
iconPath = std::move(*extractedIcon);
}
-
+ spdlog::debug("Registering app id for toast notifications");
notifications::register_application_id(TOAST_TITLE, iconPath.c_str());
auto removeShortcut = wil::scope_exit([&] {
@@ -186,6 +265,7 @@ int bootstrapper()
auto msi_path = updating::get_msi_package_path();
if (!msi_path.empty())
{
+ spdlog::error(L"Detected a newer {} version => launching its installer", installedVersion->toWstring());
MsiInstallProductW(msi_path.c_str(), nullptr);
return 0;
}
@@ -196,19 +276,22 @@ int bootstrapper()
progressParams.progress = 0.0f;
progressParams.progress_title = EXTRACTING_INSTALLER;
notifications::toast_params params{ TOAST_TAG, false, std::move(progressParams) };
- if (!cmdArgs.contains(CmdArgs::silent))
+ if (!silent)
{
+ spdlog::debug("Launching progress toast notification");
notifications::show_toast_with_activations({}, TOAST_TITLE, {}, {}, std::move(params));
}
auto processToasts = wil::scope_exit([&] {
+ spdlog::debug("Processing HWND messages for 2s so toast have time to show up");
run_message_loop(true, 2);
});
- if (!cmdArgs.contains(CmdArgs::silent))
+ if (!silent)
{
// Worker thread to periodically increase progress and keep the progress toast from losing focus
std::thread{ [&] {
+ spdlog::debug("Started worker thread for progress bar update");
for (;; Sleep(3000))
{
std::scoped_lock lock{ progressLock };
@@ -217,29 +300,31 @@ int bootstrapper()
break;
}
progressParams.progress = std::min(0.99f, progressParams.progress + 0.001f);
- notifications::update_progress_bar_toast(TOAST_TAG, progressParams);
+ notifications::update_toast_progress_bar(TOAST_TAG, progressParams);
}
} }.detach();
}
auto updateProgressBar = [&](const float value, const wchar_t* title) {
- if (cmdArgs.contains(CmdArgs::silent))
+ if (silent)
{
return;
}
std::scoped_lock lock{ progressLock };
progressParams.progress = value;
progressParams.progress_title = title;
- notifications::update_progress_bar_toast(TOAST_TAG, progressParams);
+ notifications::update_toast_progress_bar(TOAST_TAG, progressParams);
};
+ spdlog::debug("Extracting embedded MSI installer");
const auto installerPath = extractEmbeddedInstaller();
if (!installerPath)
{
- if (!cmdArgs.contains(CmdArgs::silent))
+ if (!silent)
{
notifications::show_toast(INSTALLER_EXTRACT_ERROR, TOAST_TITLE);
}
+ spdlog::error("Couldn't install the MSI installer ({})", GetLastError());
return 1;
}
auto removeExtractedInstaller = wil::scope_exit([&] {
@@ -248,12 +333,22 @@ int bootstrapper()
});
updateProgressBar(.25f, UNINSTALLING_PREVIOUS_VERSION);
+ spdlog::debug("Acquiring existing MSI package path");
const auto package_path = updating::get_msi_package_path();
- if (!package_path.empty() && !updating::uninstall_msi_version(package_path) && !cmdArgs.contains(CmdArgs::silent))
+ if (!package_path.empty())
{
+ spdlog::debug(L"Existing MSI package path: {}", package_path);
+ }
+ else
+ {
+ spdlog::debug("Existing MSI package path not found");
+ }
+ if (!package_path.empty() && !updating::uninstall_msi_version(package_path) && !silent)
+ {
+ spdlog::error("Couldn't install the existing MSI package ({})", GetLastError());
notifications::show_toast(UNINSTALL_PREVIOUS_VERSION_ERROR, TOAST_TITLE);
}
- const bool installDotnet = !cmdArgs.contains(CmdArgs::skipDotnetInstall);
+ const bool installDotnet = !skipDotnetInstall;
if (installDotnet)
{
updateProgressBar(.5f, INSTALLING_DOTNET);
@@ -261,16 +356,22 @@ int bootstrapper()
try
{
- if (installDotnet &&
- !updating::dotnet_is_installed() &&
- !updating::install_dotnet(cmdArgs.contains(CmdArgs::silent)) &&
- !cmdArgs.contains(CmdArgs::silent))
+ if (installDotnet)
{
- notifications::show_toast(DOTNET_INSTALL_ERROR, TOAST_TITLE);
+ spdlog::debug("Detecting if dotnet is installed");
+ const bool dotnetInstalled = updating::dotnet_is_installed();
+ spdlog::debug("Dotnet is installed: {}", dotnetInstalled);
+ if (!dotnetInstalled &&
+ !updating::install_dotnet(silent) &&
+ !silent)
+ {
+ notifications::show_toast(DOTNET_INSTALL_ERROR, TOAST_TITLE);
+ }
}
}
catch (...)
{
+ spdlog::error("Unknown exception during dotnet installation");
MessageBoxW(nullptr, L".NET Core installation", L"Unknown exception encountered!", MB_OK | MB_ICONERROR);
}
@@ -278,18 +379,23 @@ int bootstrapper()
// Always skip dotnet install, because we should've installed it from here earlier
std::wstring msiProps = L"SKIPDOTNETINSTALL=1 ";
+ spdlog::debug("Launching MSI installation for new package {}", installerPath->string());
const bool installationDone = MsiInstallProductW(installerPath->c_str(), msiProps.c_str()) == ERROR_SUCCESS;
updateProgressBar(1.f, installationDone ? NEW_VERSION_INSTALLATION_DONE : NEW_VERSION_INSTALLATION_ERROR);
if (!installationDone)
{
+ spdlog::error("Couldn't install new MSI package ({})", GetLastError());
return 1;
}
+ spdlog::debug("Installation completed");
- if (!cmdArgs.contains(CmdArgs::noStartPT) && !cmdArgs.contains(CmdArgs::silent))
+ if (!noStartPT && !silent)
{
+ spdlog::debug("Starting the newly installed PowerToys.exe");
auto newPTPath = updating::get_msi_package_installed_path();
if (!newPTPath)
{
+ spdlog::error("Couldn't determine new MSI package install location ({})", GetLastError());
return 1;
}
*newPTPath += L"\\PowerToys.exe";
@@ -311,7 +417,7 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
}
catch (const std::exception& ex)
{
- MessageBoxA(nullptr, ex.what(), "Unhandled stdexception encountered!", MB_OK | MB_ICONERROR);
+ MessageBoxA(nullptr, ex.what(), "Unhandled std exception encountered!", MB_OK | MB_ICONERROR);
}
catch (winrt::hresult_error const& ex)
{
diff --git a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
index 3966dac233..0f20390820 100644
--- a/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
+++ b/installer/PowerToysBootstrapper/bootstrapper/bootstrapper.vcxproj
@@ -28,6 +28,8 @@
bootstrapper
Application
true
@@ -78,7 +80,7 @@
true
MultiThreaded
true
- ../../../src/
+ ../../../src/;%(AdditionalIncludeDirectories)
Use
pch.h
@@ -99,7 +101,7 @@
true
MultiThreadedDebug
true
- ../../../src/
+ ../../../src/;%(AdditionalIncludeDirectories)
Use
pch.h
@@ -137,15 +139,18 @@
{17da04df-e393-4397-9cf0-84dabe11032e}
+
+ {7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f}
+
-
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
\ No newline at end of file
diff --git a/installer/PowerToysBootstrapper/bootstrapper/packages.config b/installer/PowerToysBootstrapper/bootstrapper/packages.config
index bac888e145..3e9434647c 100644
--- a/installer/PowerToysBootstrapper/bootstrapper/packages.config
+++ b/installer/PowerToysBootstrapper/bootstrapper/packages.config
@@ -1,4 +1,4 @@
-
\ No newline at end of file
diff --git a/installer/PowerToysBootstrapper/bootstrapper/pch.h b/installer/PowerToysBootstrapper/bootstrapper/pch.h
index 11dc82b4f6..b9367228c1 100644
--- a/installer/PowerToysBootstrapper/bootstrapper/pch.h
+++ b/installer/PowerToysBootstrapper/bootstrapper/pch.h
@@ -14,3 +14,10 @@
#include
#include
#include
+
+#include
+#include
+#include
+#include
+
+#include
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
index 8a1d14882e..8954644cfe 100644
--- a/installer/PowerToysSetup/Product.wxs
+++ b/installer/PowerToysSetup/Product.wxs
@@ -492,14 +492,11 @@
-
-
-
(func);
}
TEST_METHOD (LoadFromInvalidString_NameMissed)
{
- auto func = [] { PowerToyValues values = PowerToyValues::from_json_string(L"{\"properties\" : {\"bool_toggle_true\":{\"value\":true},\"bool_toggle_false\":{\"value\":false},\"color_picker\" : {\"value\":\"#ff8d12\"},\"int_spinner\" : {\"value\":10},\"string_text\" : {\"value\":\"a quick fox\"}},\"version\" : \"1.0\" }"); };
+ auto func = [] { PowerToyValues values = PowerToyValues::from_json_string(L"{\"properties\" : {\"bool_toggle_true\":{\"value\":true},\"bool_toggle_false\":{\"value\":false},\"color_picker\" : {\"value\":\"#ff8d12\"},\"int_spinner\" : {\"value\":10},\"string_text\" : {\"value\":\"a quick fox\"}},\"version\" : \"1.0\" }", L"Module Key"); };
Assert::ExpectException(func);
}
TEST_METHOD (LoadFromInvalidString_VersionMissed)
{
- PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"properties\" : {}}");
+ PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"properties\" : {}}", L"Module Key");
const std::wstring expectedStr = L"{\"name\" : \"Module Name\", \"properties\" : {},\"version\" : \"1.0\"}";
const auto expected = json::JsonObject::Parse(expectedStr);
const auto actual = json::JsonObject::Parse(values.serialize());
@@ -123,7 +124,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (LoadFromInvalidString_PropertiesMissed)
{
- PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"version\" : \"1.0\" }");
+ PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"version\" : \"1.0\" }", L"Module Key");
const std::wstring expectedStr = L"{\"name\":\"Module Name\",\"version\" : \"1.0\" }";
const auto expected = json::JsonObject::Parse(expectedStr);
const auto actual = json::JsonObject::Parse(values.serialize());
@@ -133,7 +134,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (LoadFromValidString_EmptyProperties)
{
- PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"properties\" : {}, \"version\" : \"1.0\" }");
+ PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"properties\" : {}, \"version\" : \"1.0\" }", L"Module Key");
const std::wstring expectedStr = L"{\"name\":\"Module Name\",\"properties\" : {},\"version\" : \"1.0\" }";
const auto expected = json::JsonObject::Parse(expectedStr);
const auto actual = json::JsonObject::Parse(values.serialize());
@@ -143,7 +144,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (LoadFromValidString_ChangedVersion)
{
- PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"properties\" : {},\"version\" : \"2.0\"}");
+ PowerToyValues values = PowerToyValues::from_json_string(L"{\"name\":\"Module Name\",\"properties\" : {},\"version\" : \"2.0\"}", L"Module Key");
const std::wstring expectedStr = L"{\"name\" : \"Module Name\", \"properties\" : {},\"version\" : \"1.0\"}"; //version from input json is ignored
const auto expected = json::JsonObject::Parse(expectedStr);
@@ -154,7 +155,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (CreateWithName)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const std::wstring expectedStr = L"{\"name\":\"Module Name\",\"properties\" : {},\"version\" : \"1.0\" }";
const auto expected = json::JsonObject::Parse(expectedStr);
@@ -165,7 +166,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyBoolPositive)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
values.add_property(L"positive_bool_value", true);
auto value = values.get_bool_value(L"positive_bool_value");
@@ -175,7 +176,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyBoolNegative)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
values.add_property(L"negative_bool_value", false);
auto value = values.get_bool_value(L"negative_bool_value");
@@ -185,7 +186,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyIntPositive)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const int intVal = 4392854;
values.add_property(L"integer", intVal);
@@ -196,7 +197,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyIntNegative)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const int intVal = -4392854;
values.add_property(L"integer", intVal);
@@ -207,7 +208,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyIntZero)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const int intVal = 0;
values.add_property(L"integer", intVal);
@@ -218,7 +219,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyStringEmpty)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const std::wstring stringVal = L"";
values.add_property(L"stringval", stringVal);
@@ -229,7 +230,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyString)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const std::wstring stringVal = L"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
values.add_property(L"stringval", stringVal);
@@ -240,7 +241,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyJsonEmpty)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const auto json = json::JsonObject();
values.add_property(L"jsonval", json);
@@ -251,7 +252,7 @@ namespace UnitTestsCommonLib
TEST_METHOD (AddPropertyJsonObject)
{
- PowerToyValues values(m_moduleName);
+ PowerToyValues values(m_moduleName, m_moduleKey);
const auto json = json::JsonObject::Parse(m_json);
values.add_property(L"jsonval", json);
diff --git a/src/common/common-md-flag/common-md-flag.vcxproj b/src/common/common-md-flag/common-md-flag.vcxproj
index 640951a24c..4a9200ebb3 100644
--- a/src/common/common-md-flag/common-md-flag.vcxproj
+++ b/src/common/common-md-flag/common-md-flag.vcxproj
@@ -114,12 +114,12 @@
-
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
\ No newline at end of file
diff --git a/src/common/common-md-flag/packages.config b/src/common/common-md-flag/packages.config
index bac888e145..3e9434647c 100644
--- a/src/common/common-md-flag/packages.config
+++ b/src/common/common-md-flag/packages.config
@@ -1,4 +1,4 @@
-
\ No newline at end of file
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 97a46b404e..d44af3419e 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -1,4 +1,4 @@
-
+
-
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
\ No newline at end of file
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index c9abbe7cb4..da8ff204d2 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -141,6 +141,9 @@
Header Files
+
+ Header Files
+
@@ -222,6 +225,9 @@
Source Files
+
+ Source Files
+
+
using namespace System::Threading;
using namespace System::Collections::Generic;
@@ -10,7 +12,7 @@ public
{
WPARAM message;
int key;
- DWORD dwExtraInfo;
+ uint64_t dwExtraInfo;
};
public
diff --git a/src/common/interop/interop.vcxproj b/src/common/interop/interop.vcxproj
index fe2dfc7862..d3b0a96b26 100644
--- a/src/common/interop/interop.vcxproj
+++ b/src/common/interop/interop.vcxproj
@@ -98,6 +98,8 @@
pch.h
true
true
+ true
+ true
diff --git a/src/common/keyboard_layout.cpp b/src/common/keyboard_layout.cpp
index 2084aba8e1..0bce4a96a7 100644
--- a/src/common/keyboard_layout.cpp
+++ b/src/common/keyboard_layout.cpp
@@ -27,7 +27,7 @@ std::vector LayoutMap::GetKeyCodeList(const bool isShortcut)
return impl->GetKeyCodeList(isShortcut);
}
-std::vector LayoutMap::GetKeyNameList(const bool isShortcut)
+std::vector> LayoutMap::GetKeyNameList(const bool isShortcut)
{
return impl->GetKeyNameList(isShortcut);
}
@@ -305,25 +305,25 @@ std::vector LayoutMap::LayoutMapImpl::GetKeyCodeList(const bool isShortcu
return keyCodes;
}
-std::vector LayoutMap::LayoutMapImpl::GetKeyNameList(const bool isShortcut)
+std::vector> LayoutMap::LayoutMapImpl::GetKeyNameList(const bool isShortcut)
{
- std::vector keyNames;
+ std::vector> keyNames;
std::vector keyCodes = GetKeyCodeList(isShortcut);
std::lock_guard lock(keyboardLayoutMap_mutex);
// If it is a key list for the shortcut control then we add a "None" key at the start
if (isShortcut)
{
- keyNames.push_back(L"None");
+ keyNames.push_back({ 0, L"None" });
for (int i = 1; i < keyCodes.size(); i++)
{
- keyNames.push_back(keyboardLayoutMap[keyCodes[i]]);
+ keyNames.push_back({ keyCodes[i], keyboardLayoutMap[keyCodes[i]] });
}
}
else
{
for (int i = 0; i < keyCodes.size(); i++)
{
- keyNames.push_back(keyboardLayoutMap[keyCodes[i]]);
+ keyNames.push_back({ keyCodes[i], keyboardLayoutMap[keyCodes[i]] });
}
}
diff --git a/src/common/keyboard_layout.h b/src/common/keyboard_layout.h
index 58fe9f5280..4b1504c466 100644
--- a/src/common/keyboard_layout.h
+++ b/src/common/keyboard_layout.h
@@ -12,7 +12,7 @@ public:
void UpdateLayout();
std::wstring GetKeyName(DWORD key);
std::vector GetKeyCodeList(const bool isShortcut = false);
- std::vector GetKeyNameList(const bool isShortcut = false);
+ std::vector> GetKeyNameList(const bool isShortcut = false);
private:
class LayoutMapImpl;
diff --git a/src/common/keyboard_layout_impl.h b/src/common/keyboard_layout_impl.h
index 9a1b07f2a8..dc1802e537 100644
--- a/src/common/keyboard_layout_impl.h
+++ b/src/common/keyboard_layout_impl.h
@@ -46,6 +46,6 @@ public:
// Function to return the list of key codes in the order for the drop down. It creates it if it doesn't exist
std::vector GetKeyCodeList(const bool isShortcut);
- // Function to return the list of key name in the order for the drop down based on the key codes
- std::vector GetKeyNameList(const bool isShortcut);
+ // Function to return the list of key name pairs in the order for the drop down based on the key codes
+ std::vector> GetKeyNameList(const bool isShortcut);
};
\ No newline at end of file
diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp
index 5139530155..f87064b4cd 100644
--- a/src/common/notifications.cpp
+++ b/src/common/notifications.cpp
@@ -11,7 +11,10 @@
#include
#include
#include
+#include
#include
+#include
+#include
#include
#include
#include
@@ -39,6 +42,7 @@ namespace
constexpr std::wstring_view APPIDS_REGISTRY = LR"(Software\Classes\AppUserModelId\)";
std::wstring APPLICATION_ID = L"Microsoft.PowerToysWin32";
+ constexpr std::wstring_view DEFAULT_TOAST_GROUP = L"PowerToysToastTag";
}
namespace localized_strings
@@ -275,11 +279,10 @@ void notifications::show_toast_with_activations(std::wstring message,
std::wstring toast_xml;
toast_xml.reserve(2048);
- toast_xml += LR"()";
- toast_xml += title;
- toast_xml += LR"( )";
- toast_xml += message;
- toast_xml += L" ";
+ toast_xml += LR"()";
+ toast_xml += LR"({title} )";
+ toast_xml += LR"({message} )";
+
if (params.progress_bar.has_value())
{
toast_xml += LR"((progress * 100)) + std::wstring(L"%"));
map.Insert(L"progressTitle", params.progress_bar->progress_title);
- winrt::Windows::UI::Notifications::NotificationData data(map);
- notification.Data(data);
}
+ winrt::Windows::UI::Notifications::NotificationData data{ map };
+ notification.Data(std::move(data));
const auto notifier = winstore::running_as_packaged() ? ToastNotificationManager::ToastNotificationManager::CreateToastNotifier() :
ToastNotificationManager::ToastNotificationManager::CreateToastNotifier(APPLICATION_ID);
@@ -412,7 +418,7 @@ void notifications::show_toast_with_activations(std::wstring message,
}
}
-void notifications::update_progress_bar_toast(std::wstring_view tag, progress_bar_params params)
+void notifications::update_toast_progress_bar(std::wstring_view tag, progress_bar_params params)
{
const auto notifier = winstore::running_as_packaged() ?
ToastNotificationManager::ToastNotificationManager::CreateToastNotifier() :
@@ -425,5 +431,41 @@ void notifications::update_progress_bar_toast(std::wstring_view tag, progress_ba
map.Insert(L"progressTitle", params.progress_title);
winrt::Windows::UI::Notifications::NotificationData data(map);
- winrt::Windows::UI::Notifications::NotificationUpdateResult res = notifier.Update(data, tag);
+ winrt::Windows::UI::Notifications::NotificationUpdateResult res = notifier.Update(data, tag, DEFAULT_TOAST_GROUP);
+}
+
+void notifications::update_toast_contents(std::wstring_view tag, std::wstring plaintext_message, std::wstring title)
+{
+ const auto notifier = winstore::running_as_packaged() ?
+ ToastNotificationManager::ToastNotificationManager::CreateToastNotifier() :
+ ToastNotificationManager::ToastNotificationManager::CreateToastNotifier(APPLICATION_ID);
+
+ winrt::Windows::Foundation::Collections::StringMap map;
+
+ map.Insert(L"title", std::move(title));
+ map.Insert(L"message", std::move(plaintext_message));
+
+ winrt::Windows::UI::Notifications::NotificationData data(map);
+ winrt::Windows::UI::Notifications::NotificationUpdateResult res = notifier.Update(data, tag, DEFAULT_TOAST_GROUP);
+}
+
+void notifications::remove_toasts(std::wstring_view tag)
+{
+ using namespace winrt::Windows::System;
+
+ try
+ {
+ User currentUser{ *User::FindAllAsync(UserType::LocalUser, UserAuthenticationStatus::LocallyAuthenticated).get().First() };
+ if (!currentUser)
+ {
+ return;
+ }
+ currentUser.GetPropertyAsync(KnownUserProperties::AccountName());
+ auto toastHistory = ToastNotificationManager::GetForUser(currentUser).History();
+ toastHistory.Remove(tag, DEFAULT_TOAST_GROUP, APPLICATION_ID);
+ }
+ catch (...)
+ {
+ // Couldn't get the current user or problem removing the toast => nothing we can do
+ }
}
diff --git a/src/common/notifications.h b/src/common/notifications.h
index 7f37f460f4..ac52539b4f 100644
--- a/src/common/notifications.h
+++ b/src/common/notifications.h
@@ -9,6 +9,7 @@
namespace notifications
{
constexpr inline const wchar_t TOAST_ACTIVATED_LAUNCH_ARG[] = L"-ToastActivated";
+ constexpr inline const wchar_t UPDATING_PROCESS_TOAST_TAG[] = L"PTUpdateNotifyTag";
void override_application_id(const std::wstring_view appID);
void register_background_toast_handler();
@@ -59,5 +60,7 @@ namespace notifications
void show_toast(std::wstring plaintext_message, std::wstring title, toast_params params = {});
void show_toast_with_activations(std::wstring plaintext_message, std::wstring title, std::wstring_view background_handler_id, std::vector actions, toast_params params = {});
- void update_progress_bar_toast(std::wstring_view tag, progress_bar_params params);
+ void update_toast_progress_bar(std::wstring_view tag, progress_bar_params params);
+ void update_toast_contents(std::wstring_view tag, std::wstring plaintext_message, std::wstring title);
+ void remove_toasts(std::wstring_view tag);
}
diff --git a/src/common/notifications/fancyzones_notifications.h b/src/common/notifications/fancyzones_notifications.h
deleted file mode 100644
index 0e79e15427..0000000000
--- a/src/common/notifications/fancyzones_notifications.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#pragma once
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include
-#include
-
-#include "../timeutil.h"
-namespace
-{
- const inline wchar_t CANT_DRAG_ELEVATED_DONT_SHOW_AGAIN_REGISTRY_PATH[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd})";
- const inline int64_t disable_interval_in_days = 30;
-}
-
-inline bool disable_cant_drag_elevated_warning()
-{
- HKEY key{};
- if (RegCreateKeyExW(HKEY_CURRENT_USER,
- CANT_DRAG_ELEVATED_DONT_SHOW_AGAIN_REGISTRY_PATH,
- 0,
- nullptr,
- REG_OPTION_NON_VOLATILE,
- KEY_ALL_ACCESS,
- nullptr,
- &key,
- nullptr) != ERROR_SUCCESS)
- {
- return false;
- }
- const auto now = timeutil::now();
- const size_t buf_size = sizeof(now);
- if (RegSetValueExW(key, nullptr, 0, REG_QWORD, reinterpret_cast(&now), sizeof(now)) != ERROR_SUCCESS)
- {
- RegCloseKey(key);
- return false;
- }
- RegCloseKey(key);
- return true;
-}
-
-inline bool is_cant_drag_elevated_warning_disabled()
-{
- HKEY key{};
- if (RegOpenKeyExW(HKEY_CURRENT_USER,
- CANT_DRAG_ELEVATED_DONT_SHOW_AGAIN_REGISTRY_PATH,
- 0,
- KEY_READ,
- &key) != ERROR_SUCCESS)
- {
- return false;
- }
- std::wstring buffer(std::numeric_limits::digits10 + 2, L'\0');
- time_t last_disabled_time{};
- DWORD time_size = static_cast(sizeof(last_disabled_time));
- if (RegGetValueW(
- key,
- nullptr,
- nullptr,
- RRF_RT_REG_QWORD,
- nullptr,
- &last_disabled_time,
- &time_size) != ERROR_SUCCESS)
- {
- RegCloseKey(key);
- return false;
- }
- RegCloseKey(key);
- return timeutil::diff::in_days(timeutil::now(), last_disabled_time) < disable_interval_in_days;
- return false;
-}
\ No newline at end of file
diff --git a/src/common/packages.config b/src/common/packages.config
index 20da4fefa3..fda08e21c1 100644
--- a/src/common/packages.config
+++ b/src/common/packages.config
@@ -1,5 +1,5 @@
\ No newline at end of file
diff --git a/src/common/settings_helpers.cpp b/src/common/settings_helpers.cpp
index 88bf018ff4..35fe5827de 100644
--- a/src/common/settings_helpers.cpp
+++ b/src/common/settings_helpers.cpp
@@ -23,11 +23,11 @@ namespace PTSettingsHelper
return result;
}
- std::wstring get_module_save_folder_location(std::wstring_view powertoy_name)
+ std::wstring get_module_save_folder_location(std::wstring_view powertoy_key)
{
std::wstring result = get_root_save_folder_location();
result += L"\\";
- result += powertoy_name;
+ result += powertoy_key;
std::filesystem::path save_path(result);
if (!std::filesystem::exists(save_path))
{
@@ -36,9 +36,9 @@ namespace PTSettingsHelper
return result;
}
- std::wstring get_module_save_file_location(std::wstring_view powertoy_name)
+ std::wstring get_module_save_file_location(std::wstring_view powertoy_key)
{
- return get_module_save_folder_location(powertoy_name) + settings_filename;
+ return get_module_save_folder_location(powertoy_key) + settings_filename;
}
std::wstring get_powertoys_general_save_file_location()
@@ -46,15 +46,15 @@ namespace PTSettingsHelper
return get_root_save_folder_location() + settings_filename;
}
- void save_module_settings(std::wstring_view powertoy_name, json::JsonObject& settings)
+ void save_module_settings(std::wstring_view powertoy_key, json::JsonObject& settings)
{
- const std::wstring save_file_location = get_module_save_file_location(powertoy_name);
+ const std::wstring save_file_location = get_module_save_file_location(powertoy_key);
json::to_file(save_file_location, settings);
}
- json::JsonObject load_module_settings(std::wstring_view powertoy_name)
+ json::JsonObject load_module_settings(std::wstring_view powertoy_key)
{
- const std::wstring save_file_location = get_module_save_file_location(powertoy_name);
+ const std::wstring save_file_location = get_module_save_file_location(powertoy_key);
auto saved_settings = json::from_file(save_file_location);
return saved_settings.has_value() ? std::move(*saved_settings) : json::JsonObject{};
}
diff --git a/src/common/settings_objects.cpp b/src/common/settings_objects.cpp
index 2bd2e8ca68..b92da8933b 100644
--- a/src/common/settings_objects.cpp
+++ b/src/common/settings_objects.cpp
@@ -1,6 +1,7 @@
#include "pch.h"
#include "settings_objects.h"
#include "settings_helpers.h"
+#include
namespace PowerToysSettings
{
@@ -277,27 +278,33 @@ namespace PowerToysSettings
return L"RESOURCE ID NOT FOUND: " + std::to_wstring(resource_id);
}
- PowerToyValues::PowerToyValues(std::wstring_view powertoy_name)
+ PowerToyValues::PowerToyValues(std::wstring_view powertoy_name, std::wstring_view powertoy_key)
{
- _name = powertoy_name;
+ _key = powertoy_key;
set_version();
m_json.SetNamedValue(L"name", json::value(powertoy_name));
m_json.SetNamedValue(L"properties", json::JsonObject{});
}
- PowerToyValues PowerToyValues::from_json_string(std::wstring_view json)
+ PowerToyValues PowerToyValues::from_json_string(std::wstring_view json, std::wstring_view powertoy_key)
{
PowerToyValues result = PowerToyValues();
+ json::JsonObject jsonObject = json::JsonValue::Parse(json).GetObjectW();
+ if (!jsonObject.HasKey(L"name"))
+ {
+ throw winrt::hresult_error(E_NOT_SET, L"name field not set");
+ }
+
result.m_json = json::JsonValue::Parse(json).GetObjectW();
- result._name = result.m_json.GetNamedString(L"name");
+ result._key = powertoy_key;
return result;
}
- PowerToyValues PowerToyValues::load_from_settings_file(std::wstring_view powertoy_name)
+ PowerToyValues PowerToyValues::load_from_settings_file(std::wstring_view powertoy_key)
{
PowerToyValues result = PowerToyValues();
- result.m_json = PTSettingsHelper::load_module_settings(powertoy_name);
- result._name = powertoy_name;
+ result.m_json = PTSettingsHelper::load_module_settings(powertoy_key);
+ result._key = powertoy_key;
return result;
}
@@ -357,7 +364,7 @@ namespace PowerToysSettings
void PowerToyValues::save_to_settings_file()
{
set_version();
- PTSettingsHelper::save_module_settings(_name, m_json);
+ PTSettingsHelper::save_module_settings(_key, m_json);
}
void PowerToyValues::set_version()
diff --git a/src/common/settings_objects.h b/src/common/settings_objects.h
index 3f2a212eb6..e27e2973ed 100644
--- a/src/common/settings_objects.h
+++ b/src/common/settings_objects.h
@@ -67,9 +67,9 @@ namespace PowerToysSettings
class PowerToyValues
{
public:
- PowerToyValues(std::wstring_view powertoy_name);
- static PowerToyValues from_json_string(std::wstring_view json);
- static PowerToyValues load_from_settings_file(std::wstring_view powertoy_name);
+ PowerToyValues(std::wstring_view powertoy_name, std::wstring_view powertoy_key);
+ static PowerToyValues from_json_string(std::wstring_view json, std::wstring_view powertoy_key);
+ static PowerToyValues load_from_settings_file(std::wstring_view powertoy_key);
template
inline void add_property(std::wstring_view name, T value)
@@ -92,7 +92,7 @@ namespace PowerToysSettings
const std::wstring m_version = L"1.0";
void set_version();
json::JsonObject m_json;
- std::wstring _name;
+ std::wstring _key;
PowerToyValues() {}
};
diff --git a/src/common/toast_dont_show_again.cpp b/src/common/toast_dont_show_again.cpp
new file mode 100644
index 0000000000..c57ee81866
--- /dev/null
+++ b/src/common/toast_dont_show_again.cpp
@@ -0,0 +1,62 @@
+#include "pch.h"
+#include "toast_dont_show_again.h"
+
+namespace notifications
+{
+ bool disable_toast(const wchar_t* registry_path)
+ {
+ HKEY key{};
+ if (RegCreateKeyExW(HKEY_CURRENT_USER,
+ registry_path,
+ 0,
+ nullptr,
+ REG_OPTION_NON_VOLATILE,
+ KEY_ALL_ACCESS,
+ nullptr,
+ &key,
+ nullptr) != ERROR_SUCCESS)
+ {
+ return false;
+ }
+ const auto now = timeutil::now();
+ const size_t buf_size = sizeof(now);
+ if (RegSetValueExW(key, nullptr, 0, REG_QWORD, reinterpret_cast(&now), sizeof(now)) != ERROR_SUCCESS)
+ {
+ RegCloseKey(key);
+ return false;
+ }
+ RegCloseKey(key);
+ return true;
+ }
+
+ bool is_toast_disabled(const wchar_t* registry_path, const int64_t disable_interval_in_days)
+ {
+ HKEY key{};
+ if (RegOpenKeyExW(HKEY_CURRENT_USER,
+ registry_path,
+ 0,
+ KEY_READ,
+ &key) != ERROR_SUCCESS)
+ {
+ return false;
+ }
+ std::wstring buffer(std::numeric_limits::digits10 + 2, L'\0');
+ time_t last_disabled_time{};
+ DWORD time_size = static_cast(sizeof(last_disabled_time));
+ if (RegGetValueW(
+ key,
+ nullptr,
+ nullptr,
+ RRF_RT_REG_QWORD,
+ nullptr,
+ &last_disabled_time,
+ &time_size) != ERROR_SUCCESS)
+ {
+ RegCloseKey(key);
+ return false;
+ }
+ RegCloseKey(key);
+ return timeutil::diff::in_days(timeutil::now(), last_disabled_time) < disable_interval_in_days;
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/common/toast_dont_show_again.h b/src/common/toast_dont_show_again.h
new file mode 100644
index 0000000000..95444b0d5a
--- /dev/null
+++ b/src/common/toast_dont_show_again.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "timeutil.h"
+
+namespace notifications
+{
+ const inline wchar_t CantDragElevatedDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd})";
+ const inline int64_t CantDragElevatedDisableIntervalInDays = 30;
+
+ const inline wchar_t PreviewModulesDontShowAgainRegistryPath[] = LR"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{7e29e2b2-b31c-4dcd-b7b0-79c078b02430})";
+ const inline int64_t PreviewModulesDisableIntervalInDays = 30;
+
+ bool disable_toast(const wchar_t* registry_path);
+ bool is_toast_disabled(const wchar_t* registry_path, const int64_t disable_interval_in_days);
+}
diff --git a/src/common/updating/toast_notifications_helper.cpp b/src/common/updating/notifications.cpp
similarity index 51%
rename from src/common/updating/toast_notifications_helper.cpp
rename to src/common/updating/notifications.cpp
index 73a8f00906..8984df265f 100644
--- a/src/common/updating/toast_notifications_helper.cpp
+++ b/src/common/updating/notifications.cpp
@@ -1,150 +1,161 @@
-#include "pch.h"
-
-#include "toast_notifications_helper.h"
-
-#include
-
-#include "updating.h"
-
-#include "VersionHelper.h"
-#include "version.h"
-
-namespace
-{
- const wchar_t UPDATE_NOTIFY_TOAST_TAG[] = L"PTUpdateNotifyTag";
- const wchar_t UPDATE_READY_TOAST_TAG[] = L"PTUpdateReadyTag";
- const wchar_t TOAST_TITLE[] = L"PowerToys Update";
-}
-
-namespace localized_strings
-{
- const wchar_t GITHUB_NEW_VERSION_AVAILABLE[] = L"An update to PowerToys is available.\n";
- const wchar_t GITHUB_NEW_VERSION_DOWNLOAD_STARTED[] = L"PowerToys download started.\n";
- const wchar_t GITHUB_NEW_VERSION_READY_TO_INSTALL[] = L"An update to PowerToys is ready to install.\n";
- const wchar_t GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR[] = L"Error: couldn't download PowerToys installer. Visit our GitHub page to update.\n";
- const wchar_t GITHUB_NEW_VERSION_UPDATE_NOW[] = L"Update now";
- const wchar_t GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART[] = L"At next launch";
-
- const wchar_t UNINSTALLATION_UNKNOWN_ERROR[] = L"Error: please uninstall the previous version of PowerToys manually.";
-
- const wchar_t GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT[] = L"An update to PowerToys is available. Visit our GitHub page to update.\n";
- const wchar_t GITHUB_NEW_VERSION_UNAVAILABLE[] = L"PowerToys is up to date.\n";
- const wchar_t GITHUB_NEW_VERSION_VISIT[] = L"Visit";
- const wchar_t GITHUB_NEW_VERSION_MORE_INFO[] = L"More info...";
- const wchar_t GITHUB_NEW_VERSION_ABORT[] = L"Abort";
- const wchar_t GITHUB_NEW_VERSION_SNOOZE_TITLE[] = L"Click Snooze to be reminded in:";
- const wchar_t GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D[] = L"1 day";
- const wchar_t GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D[] = L"5 days";
- const wchar_t DOWNLOAD_IN_PROGRESS[] = L"Downloading...";
- const wchar_t DOWNLOAD_COMPLETE[] = L"Download complete";
-
-}
-
-namespace updating
-{
- namespace notifications
- {
- using namespace localized_strings;
-
- std::wstring current_version_to_next_version(const updating::new_version_download_info& info)
- {
- auto current_version_to_next_version = VersionHelper{ VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION }.toWstring();
- current_version_to_next_version += L" -> ";
- current_version_to_next_version += info.version_string;
- return current_version_to_next_version;
- }
-
- void show_unavailable()
- {
- ::notifications::toast_params toast_params{ UPDATE_NOTIFY_TOAST_TAG, false };
- std::wstring contents = GITHUB_NEW_VERSION_UNAVAILABLE;
- ::notifications::show_toast(std::move(contents), TOAST_TITLE, std::move(toast_params));
- }
-
- void show_available(const updating::new_version_download_info& info)
- {
- ::notifications::toast_params toast_params{ UPDATE_NOTIFY_TOAST_TAG, false };
- std::wstring contents = GITHUB_NEW_VERSION_AVAILABLE;
- contents += current_version_to_next_version(info);
-
- ::notifications::show_toast_with_activations(std::move(contents),
- TOAST_TITLE,
- {},
- { ::notifications::link_button{ GITHUB_NEW_VERSION_UPDATE_NOW, L"powertoys://download_and_install_update/" }, ::notifications::link_button{ GITHUB_NEW_VERSION_MORE_INFO, info.release_page_uri.ToString().c_str() } },
- std::move(toast_params));
- }
-
- void show_download_start(const updating::new_version_download_info& info)
- {
- ::notifications::progress_bar_params progress_bar_params;
- std::wstring progress_title{ info.version_string };
- progress_title += L' ';
- progress_title += localized_strings::DOWNLOAD_IN_PROGRESS;
-
- progress_bar_params.progress_title = progress_title;
- progress_bar_params.progress = .0f;
- ::notifications::toast_params toast_params{ UPDATE_NOTIFY_TOAST_TAG, false, std::move(progress_bar_params) };
- ::notifications::show_toast_with_activations(localized_strings::GITHUB_NEW_VERSION_DOWNLOAD_STARTED,
- TOAST_TITLE,
- {},
- {},
- std::move(toast_params));
- }
-
- void show_visit_github(const updating::new_version_download_info& info)
- {
- ::notifications::toast_params toast_params{ UPDATE_NOTIFY_TOAST_TAG, false };
- std::wstring contents = GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT;
- contents += current_version_to_next_version(info);
- ::notifications::show_toast_with_activations(std::move(contents),
- TOAST_TITLE,
- {},
- { ::notifications::link_button{ GITHUB_NEW_VERSION_VISIT, info.release_page_uri.ToString().c_str() } },
- std::move(toast_params));
- }
-
- void show_install_error(const updating::new_version_download_info& info)
- {
- ::notifications::toast_params toast_params{ UPDATE_NOTIFY_TOAST_TAG, false };
- std::wstring contents = GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR;
- contents += current_version_to_next_version(info);
- ::notifications::show_toast_with_activations(std::move(contents),
- TOAST_TITLE,
- {},
- { ::notifications::link_button{ GITHUB_NEW_VERSION_VISIT, info.release_page_uri.ToString().c_str() } },
- std::move(toast_params));
- }
-
- void show_version_ready(const updating::new_version_download_info& info)
- {
- ::notifications::toast_params toast_params{ UPDATE_READY_TOAST_TAG, false };
- std::wstring new_version_ready{ GITHUB_NEW_VERSION_READY_TO_INSTALL };
- new_version_ready += current_version_to_next_version(info);
-
- ::notifications::show_toast_with_activations(std::move(new_version_ready),
- TOAST_TITLE,
- {},
- { ::notifications::link_button{ GITHUB_NEW_VERSION_UPDATE_NOW, L"powertoys://update_now/" + info.installer_filename },
- ::notifications::link_button{ GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART, L"powertoys://schedule_update/" + info.installer_filename },
- ::notifications::snooze_button{ GITHUB_NEW_VERSION_SNOOZE_TITLE, { { GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D, 24 * 60 }, { GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D, 120 * 60 } } } },
- std::move(toast_params));
- }
-
- void show_uninstallation_error()
- {
- ::notifications::show_toast(localized_strings::UNINSTALLATION_UNKNOWN_ERROR, TOAST_TITLE);
- }
-
- void update_download_progress(const updating::new_version_download_info& info, float progress)
- {
- ::notifications::progress_bar_params progress_bar_params;
-
- std::wstring progress_title{ info.version_string };
- progress_title += L' ';
- progress_title += progress < 1 ? localized_strings::DOWNLOAD_IN_PROGRESS : localized_strings::DOWNLOAD_COMPLETE;
- progress_bar_params.progress_title = progress_title;
- progress_bar_params.progress = progress;
- ::notifications::update_progress_bar_toast(UPDATE_NOTIFY_TOAST_TAG, progress_bar_params);
- }
- }
+#include "pch.h"
+
+#include "notifications.h"
+
+#include
+
+#include "updating.h"
+
+#include "VersionHelper.h"
+#include "version.h"
+
+namespace
+{
+ const wchar_t TOAST_TITLE[] = L"PowerToys Update";
+}
+
+namespace localized_strings
+{
+ const wchar_t GITHUB_NEW_VERSION_AVAILABLE[] = L"An update to PowerToys is available.\n";
+ const wchar_t GITHUB_NEW_VERSION_DOWNLOAD_STARTED[] = L"PowerToys download started.\n";
+ const wchar_t GITHUB_NEW_VERSION_READY_TO_INSTALL[] = L"An update to PowerToys is ready to install.\n";
+ const wchar_t GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR[] = L"Error: couldn't download PowerToys installer. Visit our GitHub page to update.\n";
+ const wchar_t GITHUB_NEW_VERSION_UPDATE_NOW[] = L"Update now";
+ const wchar_t GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART[] = L"At next launch";
+
+ const wchar_t UNINSTALLATION_UNKNOWN_ERROR[] = L"Error: please uninstall the previous version of PowerToys manually.";
+
+ const wchar_t GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT[] = L"An update to PowerToys is available. Visit our GitHub page to update.\n";
+ const wchar_t GITHUB_NEW_VERSION_UNAVAILABLE[] = L"PowerToys is up to date.\n";
+ const wchar_t GITHUB_NEW_VERSION_VISIT[] = L"Visit";
+ const wchar_t GITHUB_NEW_VERSION_MORE_INFO[] = L"More info...";
+ const wchar_t GITHUB_NEW_VERSION_ABORT[] = L"Abort";
+ const wchar_t GITHUB_NEW_VERSION_SNOOZE_TITLE[] = L"Click Snooze to be reminded in:";
+ const wchar_t GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D[] = L"1 day";
+ const wchar_t GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D[] = L"5 days";
+ const wchar_t DOWNLOAD_IN_PROGRESS[] = L"Downloading...";
+ const wchar_t DOWNLOAD_COMPLETE[] = L"Download complete";
+}
+
+namespace updating
+{
+ namespace notifications
+ {
+ using namespace localized_strings;
+ using namespace ::notifications;
+ std::wstring current_version_to_next_version(const updating::new_version_download_info& info)
+ {
+ auto current_version_to_next_version = VersionHelper{ VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION }.toWstring();
+ current_version_to_next_version += L" -> ";
+ current_version_to_next_version += info.version_string;
+ return current_version_to_next_version;
+ }
+
+ void show_unavailable()
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false };
+ std::wstring contents = GITHUB_NEW_VERSION_UNAVAILABLE;
+ show_toast(std::move(contents), TOAST_TITLE, std::move(toast_params));
+ }
+
+ void show_available(const updating::new_version_download_info& info)
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false };
+ std::wstring contents = GITHUB_NEW_VERSION_AVAILABLE;
+ contents += current_version_to_next_version(info);
+
+ show_toast_with_activations(std::move(contents),
+ TOAST_TITLE,
+ {},
+ { link_button{ GITHUB_NEW_VERSION_UPDATE_NOW, L"powertoys://download_and_install_update/" }, link_button{ GITHUB_NEW_VERSION_MORE_INFO, info.release_page_uri.ToString().c_str() } },
+ std::move(toast_params));
+ }
+
+ void show_download_start(const updating::new_version_download_info& info)
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ progress_bar_params progress_bar_params;
+ std::wstring progress_title{ info.version_string };
+ progress_title += L' ';
+ progress_title += localized_strings::DOWNLOAD_IN_PROGRESS;
+
+ progress_bar_params.progress_title = progress_title;
+ progress_bar_params.progress = .0f;
+ toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false, std::move(progress_bar_params) };
+ show_toast_with_activations(localized_strings::GITHUB_NEW_VERSION_DOWNLOAD_STARTED,
+ TOAST_TITLE,
+ {},
+ {},
+ std::move(toast_params));
+ }
+
+ void show_visit_github(const updating::new_version_download_info& info)
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false };
+ std::wstring contents = GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT;
+ contents += current_version_to_next_version(info);
+ show_toast_with_activations(std::move(contents),
+ TOAST_TITLE,
+ {},
+ { link_button{ GITHUB_NEW_VERSION_VISIT, info.release_page_uri.ToString().c_str() } },
+ std::move(toast_params));
+ }
+
+ void show_install_error(const updating::new_version_download_info& info)
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false };
+ std::wstring contents = GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR;
+ contents += current_version_to_next_version(info);
+ show_toast_with_activations(std::move(contents),
+ TOAST_TITLE,
+ {},
+ { link_button{ GITHUB_NEW_VERSION_VISIT, info.release_page_uri.ToString().c_str() } },
+ std::move(toast_params));
+ }
+
+ void show_version_ready(const updating::new_version_download_info& info)
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false };
+ std::wstring new_version_ready{ GITHUB_NEW_VERSION_READY_TO_INSTALL };
+ new_version_ready += current_version_to_next_version(info);
+
+ show_toast_with_activations(std::move(new_version_ready),
+ TOAST_TITLE,
+ {},
+ { link_button{ GITHUB_NEW_VERSION_UPDATE_NOW, L"powertoys://update_now/" + info.installer_filename },
+ link_button{ GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART, L"powertoys://schedule_update/" + info.installer_filename },
+ snooze_button{ GITHUB_NEW_VERSION_SNOOZE_TITLE, { { GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D, 24 * 60 }, { GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D, 120 * 60 } } } },
+ std::move(toast_params));
+ }
+
+ void show_uninstallation_error()
+ {
+ remove_toasts(UPDATING_PROCESS_TOAST_TAG);
+
+ show_toast(localized_strings::UNINSTALLATION_UNKNOWN_ERROR, TOAST_TITLE);
+ }
+
+ void update_download_progress(const updating::new_version_download_info& info, float progress)
+ {
+ progress_bar_params progress_bar_params;
+
+ std::wstring progress_title{ info.version_string };
+ progress_title += L' ';
+ progress_title += progress < 1 ? localized_strings::DOWNLOAD_IN_PROGRESS : localized_strings::DOWNLOAD_COMPLETE;
+ progress_bar_params.progress_title = progress_title;
+ progress_bar_params.progress = progress;
+ update_toast_progress_bar(UPDATING_PROCESS_TOAST_TAG, progress_bar_params);
+ }
+ }
}
\ No newline at end of file
diff --git a/src/common/updating/toast_notifications_helper.h b/src/common/updating/notifications.h
similarity index 97%
rename from src/common/updating/toast_notifications_helper.h
rename to src/common/updating/notifications.h
index 6ae3665e2d..30f33f0470 100644
--- a/src/common/updating/toast_notifications_helper.h
+++ b/src/common/updating/notifications.h
@@ -1,19 +1,19 @@
-#pragma once
-
-namespace updating
-{
- struct new_version_download_info;
-
- namespace notifications
- {
- void show_unavailable();
- void show_available(const updating::new_version_download_info& info);
- void show_download_start(const updating::new_version_download_info& info);
- void show_visit_github(const updating::new_version_download_info& info);
- void show_install_error(const updating::new_version_download_info& info);
- void show_version_ready(const updating::new_version_download_info& info);
- void show_uninstallation_error();
-
- void update_download_progress(const updating::new_version_download_info& info, float progress);
- }
+#pragma once
+
+namespace updating
+{
+ struct new_version_download_info;
+
+ namespace notifications
+ {
+ void show_unavailable();
+ void show_available(const updating::new_version_download_info& info);
+ void show_download_start(const updating::new_version_download_info& info);
+ void show_visit_github(const updating::new_version_download_info& info);
+ void show_install_error(const updating::new_version_download_info& info);
+ void show_version_ready(const updating::new_version_download_info& info);
+ void show_uninstallation_error();
+
+ void update_download_progress(const updating::new_version_download_info& info, float progress);
+ }
}
\ No newline at end of file
diff --git a/src/common/updating/updating.cpp b/src/common/updating/updating.cpp
index 165cf0a69a..c2f0e6e536 100644
--- a/src/common/updating/updating.cpp
+++ b/src/common/updating/updating.cpp
@@ -3,8 +3,8 @@
#include "version.h"
#include "http_client.h"
+#include "notifications.h"
#include "updating.h"
-#include "toast_notifications_helper.h"
#include
#include
@@ -102,6 +102,11 @@ namespace updating
std::future> get_new_github_version_info_async()
{
+ // If the current version starts with 0.0.*, it means we're on a local build from a farm and shouldn't check for updates.
+ if (VERSION_MAJOR == 0 && VERSION_MINOR == 0)
+ {
+ co_return std::nullopt;
+ }
try
{
http::HttpClient client;
diff --git a/src/common/updating/updating.vcxproj b/src/common/updating/updating.vcxproj
index 24c10721ca..48d6b3f01a 100644
--- a/src/common/updating/updating.vcxproj
+++ b/src/common/updating/updating.vcxproj
@@ -175,14 +175,14 @@
Create
diff --git a/src/common/updating/updating.vcxproj.filters b/src/common/updating/updating.vcxproj.filters
index dc5c1b089a..bc72ef6795 100644
--- a/src/common/updating/updating.vcxproj.filters
+++ b/src/common/updating/updating.vcxproj.filters
@@ -21,15 +21,15 @@
Header Files
-
- Header Files
-
Header Files
Header Files
+
+ Header Files
+
@@ -38,15 +38,15 @@
Source Files
-
- Source Files
-
Source Files
Source Files
+
+ Source Files
+
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerProperties.cs
similarity index 51%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerProperties.cs
index a726465679..7f65789992 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerProperties.cs
@@ -5,12 +5,34 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public enum ColorRepresentationType
{
+ ///
+ /// Color presentation as hexadecimal color value without the alpha-value (e.g. #0055FF)
+ ///
HEX = 0,
+
+ ///
+ /// Color presentation as RGB color value (red[0..255], green[0..255], blue[0..255])
+ ///
RGB = 1,
+
+ ///
+ /// Color presentation as CMYK color value (cyan[0%..100%], magenta[0%..100%], yellow[0%..100%], black key[0%..100%])
+ ///
+ CMYK = 2,
+
+ ///
+ /// Color presentation as HSL color value (hue[0°..360°], saturation[0..100%], lightness[0%..100%])
+ ///
+ HSL = 3,
+
+ ///
+ /// Color presentation as HSV color value (hue[0°..360°], saturation[0%..100%], value[0%..100%])
+ ///
+ HSV = 4,
}
public class ColorPickerProperties
@@ -31,8 +53,6 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
public ColorRepresentationType CopiedColorRepresentation { get; set; }
public override string ToString()
- {
- return JsonSerializer.Serialize(this);
- }
+ => JsonSerializer.Serialize(this);
}
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerSettings.cs
similarity index 83%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerSettings.cs
index 849bae1909..72ebb295c9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ColorPickerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ColorPickerSettings.cs
@@ -2,11 +2,12 @@
// 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.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ColorPickerSettings : BasePTModuleSettings, ISettingsConfig
{
@@ -30,6 +31,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
WriteIndented = true,
};
+ if (settingsUtils == null)
+ {
+ throw new ArgumentNullException(nameof(settingsUtils));
+ }
+
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ConfigDefaults.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ConfigDefaults.cs
index 5d25a15d00..12a4819063 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ConfigDefaults.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ConfigDefaults.cs
@@ -2,7 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public static class ConfigDefaults
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomActionDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomActionDataModel.cs
similarity index 87%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomActionDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomActionDataModel.cs
index e4bf4224ae..ee7617c85f 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomActionDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomActionDataModel.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
{
public class CustomActionDataModel
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomNamePolicy.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomNamePolicy.cs
similarity index 90%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomNamePolicy.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomNamePolicy.cs
index 0de49f3fd4..a64feddffe 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/CustomNamePolicy.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/CustomNamePolicy.cs
@@ -5,7 +5,7 @@
using System;
using System.Text.Json;
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
{
public class CustomNamePolicy : JsonNamingPolicy
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/ModuleCustomAction.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/ModuleCustomAction.cs
similarity index 82%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/ModuleCustomAction.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/ModuleCustomAction.cs
index c0168b8bfa..99c57fa2a2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/ModuleCustomAction.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/ModuleCustomAction.cs
@@ -2,7 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
{
public class ModuleCustomAction
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/SendCustomAction.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/SendCustomAction.cs
similarity index 77%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/SendCustomAction.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/SendCustomAction.cs
index 515be86b6e..e863cd496a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/CustomAction/SendCustomAction.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/CustomAction/SendCustomAction.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
+namespace Microsoft.PowerToys.Settings.UI.Library.CustomAction
{
public class SendCustomAction
{
@@ -25,7 +25,8 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.CustomAction
{
PropertyNamingPolicy = new CustomNamePolicy((propertyName) =>
{
- return propertyName.Equals("ModuleAction") ? moduleName : propertyName;
+ // Using Ordinal as this is an internal property name
+ return propertyName.Equals("ModuleAction", System.StringComparison.Ordinal) ? moduleName : propertyName;
}),
};
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/DoubleProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/DoubleProperty.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/DoubleProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/DoubleProperty.cs
index 4b6ee0f1f6..7854f70529 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/DoubleProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/DoubleProperty.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
// Represents the configuration property of the settings that store Double type.
public class DoubleProperty
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs
index eb38781b4e..1fadcb961b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/EnabledModules.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs
@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
using Microsoft.PowerToys.Settings.Telemetry;
using Microsoft.PowerToys.Telemetry;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class EnabledModules
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs
index 7d5e379087..9ce51ba406 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FZConfigProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/FZConfigProperties.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class FZConfigProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettings.cs
index 570b75cc97..bff72a5984 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettings.cs
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class FancyZonesSettings : BasePTModuleSettings, ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettingsIPCMessage.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettingsIPCMessage.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettingsIPCMessage.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettingsIPCMessage.cs
index e56d53f534..4da9cac2f1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/FancyZonesSettingsIPCMessage.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/FancyZonesSettingsIPCMessage.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class FancyZonesSettingsIPCMessage
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettings.cs
similarity index 87%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettings.cs
index ea0c0107da..9c062e9bd4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettings.cs
@@ -3,12 +3,13 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class GeneralSettings : ISettingsConfig
{
@@ -53,6 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
[JsonPropertyName("download_updates_automatically")]
public bool AutoDownloadUpdates { get; set; }
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Any error from calling interop code should not prevent the program from loading.")]
public GeneralSettings()
{
Packaged = false;
@@ -66,8 +68,9 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
{
PowertoysVersion = DefaultPowertoysVersion();
}
- catch
+ catch (Exception e)
{
+ Logger.LogError("Exception encountered when getting PowerToys version", e);
PowertoysVersion = "v0.0.0";
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettingsCustomAction.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettingsCustomAction.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettingsCustomAction.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettingsCustomAction.cs
index 5554ce9a60..f180ca3186 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GeneralSettingsCustomAction.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/GeneralSettingsCustomAction.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class GeneralSettingsCustomAction
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GenericProperty`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/GenericProperty`1.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/GenericProperty`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/GenericProperty`1.cs
index 8a75f16e46..7fa02ba03c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/GenericProperty`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/GenericProperty`1.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class GenericProperty
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Library/Helpers/Observable.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Helpers/Observable.cs
new file mode 100644
index 0000000000..a77099b4b8
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Helpers/Observable.cs
@@ -0,0 +1,27 @@
+// 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.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
+{
+ public class Observable : INotifyPropertyChanged
+ {
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected void Set(ref T storage, T value, [CallerMemberName] string propertyName = null)
+ {
+ if (Equals(storage, value))
+ {
+ return;
+ }
+
+ storage = value;
+ OnPropertyChanged(propertyName);
+ }
+
+ protected void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+ }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs
index 37ee7da743..9fe1099a2d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettings.cs
@@ -4,9 +4,9 @@
using System.Text;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class HotkeySettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettingsControlHook.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs
similarity index 69%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettingsControlHook.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs
index 1b7cfc48d2..0c738a2ff2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/HotkeySettingsControlHook.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/HotkeySettingsControlHook.cs
@@ -3,9 +3,10 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Diagnostics.CodeAnalysis;
using interop;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public delegate void KeyEvent(int key);
@@ -13,17 +14,19 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
public delegate bool FilterAccessibleKeyboardEvents(int key, UIntPtr extraInfo);
- public class HotkeySettingsControlHook
+ public class HotkeySettingsControlHook : IDisposable
{
private const int WmKeyDown = 0x100;
private const int WmKeyUp = 0x101;
private const int WmSysKeyDown = 0x0104;
private const int WmSysKeyUp = 0x0105;
+ [SuppressMessage("Usage", "CA2213:Disposable fields should be disposed", Justification = "This class conforms to the IDisposable pattern, and the Dispose and C++ destructor does get called when debugging. Looks like a false positive from FxCop.")]
private KeyboardHook _hook;
private KeyEvent _keyDown;
private KeyEvent _keyUp;
private IsActive _isActive;
+ private bool disposedValue;
private FilterAccessibleKeyboardEvents _filterKeyboardEvent;
@@ -62,10 +65,24 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
return _filterKeyboardEvent(ev.key, (UIntPtr)ev.dwExtraInfo);
}
+ protected virtual void Dispose(bool disposing)
+ {
+ if (!disposedValue)
+ {
+ if (disposing)
+ {
+ // Dispose the KeyboardHook object to terminate the hook threads
+ _hook.Dispose();
+ }
+
+ disposedValue = true;
+ }
+ }
+
public void Dispose()
{
- // Dispose the KeyboardHook object to terminate the hook threads
- _hook.Dispose();
+ Dispose(disposing: true);
+ GC.SuppressFinalize(this);
}
}
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ISettingsUtils.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ISettingsUtils.cs
similarity index 85%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ISettingsUtils.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ISettingsUtils.cs
index c5083f3a16..1fa497af48 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ISettingsUtils.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ISettingsUtils.cs
@@ -2,9 +2,9 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public interface ISettingsUtils
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerProperties.cs
similarity index 98%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerProperties.cs
index ef217cb47b..7178958c2c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerProperties.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImageResizerProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerSettings.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerSettings.cs
index cffb1e0f9e..b956e04120 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageResizerSettings.cs
@@ -4,9 +4,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImageResizerSettings : BasePTModuleSettings, ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
index a5d2d4aea1..6da91eca0d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageSize.cs
@@ -2,12 +2,13 @@
// 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.ComponentModel;
using System.Runtime.CompilerServices;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImageSize : INotifyPropertyChanged
{
@@ -222,6 +223,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
public void Update(ImageSize modifiedSize)
{
+ if (modifiedSize == null)
+ {
+ throw new ArgumentNullException(nameof(modifiedSize));
+ }
+
Id = modifiedSize.Id;
Name = modifiedSize.Name;
Fit = modifiedSize.Fit;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImagerResizerKeepDateModified.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImagerResizerKeepDateModified.cs
similarity index 90%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImagerResizerKeepDateModified.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImagerResizerKeepDateModified.cs
index 1d9be0d93a..b402312040 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImagerResizerKeepDateModified.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImagerResizerKeepDateModified.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImagerResizerKeepDateModified
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerCustomSizeProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerCustomSizeProperty.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerCustomSizeProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerCustomSizeProperty.cs
index 71ccd88d8e..da2747f845 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerCustomSizeProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerCustomSizeProperty.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImageResizerCustomSizeProperty
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerFallbackEncoder.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerFallbackEncoder.cs
similarity index 90%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerFallbackEncoder.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerFallbackEncoder.cs
index 4663d3e381..e1b70603a2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerFallbackEncoder.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerFallbackEncoder.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImageResizerFallbackEncoder
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerSizes.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerSizes.cs
similarity index 68%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerSizes.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerSizes.cs
index 38ae835af1..6ca2b550c4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageresizerSizes.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ImageresizerSizes.cs
@@ -6,12 +6,17 @@ using System.Collections.ObjectModel;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ImageResizerSizes
{
+ // Suppressing this warning because removing the setter breaks
+ // deserialization with System.Text.Json. This affects the UI display.
+ // See: https://github.com/dotnet/runtime/issues/30258
[JsonPropertyName("value")]
+#pragma warning disable CA2227 // Collection properties should be read only
public ObservableCollection Value { get; set; }
+#pragma warning restore CA2227 // Collection properties should be read only
public ImageResizerSizes()
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/IntProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/IntProperty.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/IntProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/IntProperty.cs
index 59da1fa985..fc7a6376da 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/IntProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/IntProperty.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
// Represents the configuration property of the settings that store Integer type.
public class IntProperty
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsConfig.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsConfig.cs
similarity index 88%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsConfig.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsConfig.cs
index fa0291568f..0b49cad8eb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsConfig.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsConfig.cs
@@ -2,7 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.PowerToys.Settings.UI.Lib.Interface
+namespace Microsoft.PowerToys.Settings.UI.Library.Interfaces
{
// Common interface to be implemented by all the objects which get and store settings properties.
public interface ISettingsConfig
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsRepository`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsRepository`1.cs
similarity index 82%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsRepository`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsRepository`1.cs
index 6caadb85f9..221a5d04a1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Interface/ISettingsRepository`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Interfaces/ISettingsRepository`1.cs
@@ -2,7 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.PowerToys.Settings.UI.Lib.Interface
+namespace Microsoft.PowerToys.Settings.UI.Library.Interfaces
{
public interface ISettingsRepository
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyBoardKeysProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyBoardKeysProperty.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyBoardKeysProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyBoardKeysProperty.cs
index 1977918c69..00e8a797e5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyBoardKeysProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyBoardKeysProperty.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class KeyboardKeysProperty
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProfile.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProfile.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProfile.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProfile.cs
index 66246e2cc4..0ad511a357 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProfile.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProfile.cs
@@ -4,9 +4,9 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class KeyboardManagerProfile : ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProperties.cs
similarity index 95%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProperties.cs
index 29fe04e23b..1c8f17ed7a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerProperties.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class KeyboardManagerProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerSettings.cs
index ffe032a47e..a52fdceea2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeyboardManagerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeyboardManagerSettings.cs
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class KeyboardManagerSettings : BasePTModuleSettings, ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeysDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeysDataModel.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/KeysDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/KeysDataModel.cs
index 5085c7fa8a..f19caa4c85 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/KeysDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/KeysDataModel.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
using System.Linq;
using System.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class KeysDataModel
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj
similarity index 81%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj
index 525be8b769..4deb2dea1e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Microsoft.PowerToys.Settings.UI.Lib.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Microsoft.PowerToys.Settings.UI.Library.csproj
@@ -8,13 +8,14 @@
$(Version).0
Microsoft Corporation
PowerToys
- PowerToys Settings UI Lib
+ PowerToys Settings UI Library
Copyright (C) 2020 Microsoft Corporation
https://github.com/microsoft/PowerToys
Github
PowerToys
en-US
true
+ Microsoft.PowerToys.Settings.UI.Lib
@@ -41,6 +42,11 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+ 3.3.0
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/OutGoingGeneralSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/OutGoingGeneralSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/OutGoingGeneralSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/OutGoingGeneralSettings.cs
index 2fade3fa24..d040016660 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/OutGoingGeneralSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/OutGoingGeneralSettings.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class OutGoingGeneralSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherProperties.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherProperties.cs
index e590f5da3f..dc96ff0c1a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherProperties.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerLauncherProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherSettings.cs
similarity index 83%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherSettings.cs
index 124657664c..61bf9f3339 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerLauncherSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerLauncherSettings.cs
@@ -2,11 +2,12 @@
// 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.Text.Json;
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerLauncherSettings : BasePTModuleSettings, ISettingsConfig
{
@@ -30,6 +31,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
WriteIndented = true,
};
+ if (settingsUtils == null)
+ {
+ throw new ArgumentNullException(nameof(settingsUtils));
+ }
+
settingsUtils.SaveSettings(JsonSerializer.Serialize(this, options), ModuleName);
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewProperties.cs
similarity index 97%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewProperties.cs
index 5cdc009e79..6e7e4b4297 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewProperties.cs
@@ -8,7 +8,7 @@ using System.Text.Json.Serialization;
using Microsoft.PowerToys.Settings.Telemetry;
using Microsoft.PowerToys.Telemetry;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerPreviewProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewSettings.cs
index 0e41d098cf..5cdb94b923 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerPreviewSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerPreviewSettings.cs
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerPreviewSettings : BasePTModuleSettings, ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameLocalProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameLocalProperties.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameLocalProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameLocalProperties.cs
index 3136edd2a6..2bed187bcd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameLocalProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameLocalProperties.cs
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerRenameLocalProperties : ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameProperties.cs
similarity index 96%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameProperties.cs
index dffa50d639..1c64f119d3 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameProperties.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerRenameProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettings.cs
similarity index 86%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettings.cs
index 0d7dc58a98..be74a62ba1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettings.cs
@@ -2,10 +2,11 @@
// 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.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerRenameSettings : BasePTModuleSettings, ISettingsConfig
{
@@ -23,6 +24,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
public PowerRenameSettings(PowerRenameLocalProperties localProperties)
{
+ if (localProperties == null)
+ {
+ throw new ArgumentNullException(nameof(localProperties));
+ }
+
Properties = new PowerRenameProperties();
Properties.PersistState.Value = localProperties.PersistState;
Properties.MRUEnabled.Value = localProperties.MRUEnabled;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettingsIPCMessage.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettingsIPCMessage.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettingsIPCMessage.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettingsIPCMessage.cs
index b410a9600e..94e7c37118 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/PowerRenameSettingsIPCMessage.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/PowerRenameSettingsIPCMessage.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class PowerRenameSettingsIPCMessage
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/RemapKeysDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/RemapKeysDataModel.cs
similarity index 61%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/RemapKeysDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/RemapKeysDataModel.cs
index 873d5d7d64..2258fbc4e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/RemapKeysDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/RemapKeysDataModel.cs
@@ -6,12 +6,17 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class RemapKeysDataModel
{
+ // Suppressing this warning because removing the setter breaks
+ // deserialization with System.Text.Json. This affects the UI display.
+ // See: https://github.com/dotnet/runtime/issues/30258
[JsonPropertyName("inProcess")]
+#pragma warning disable CA2227 // Collection properties should be read only
public List InProcessRemapKeys { get; set; }
+#pragma warning restore CA2227 // Collection properties should be read only
public RemapKeysDataModel()
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsRepository`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs
similarity index 84%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsRepository`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs
index 3bb7df8518..6b387805be 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsRepository`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsRepository`1.cs
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
using System;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
// This Singleton class is a wrapper around the settings configurations that are accessed by viewmodels.
// This class can have only one instance and therefore the settings configurations are common to all.
@@ -20,7 +20,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
private T settingsConfig;
+ // Suppressing the warning as this is a singleton class and this method is
+ // necessarily static
+#pragma warning disable CA1000 // Do not declare static members on generic types
public static SettingsRepository GetInstance(ISettingsUtils settingsUtils)
+#pragma warning restore CA1000 // Do not declare static members on generic types
{
// To ensure that only one instance of Settings Repository is created in a multi-threaded environment.
lock (_SettingsRepoLock)
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsUtils.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs
similarity index 87%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsUtils.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs
index 681727ba22..c37c3a89ad 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SettingsUtils.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SettingsUtils.cs
@@ -3,11 +3,13 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SettingsUtils : ISettingsUtils
{
@@ -100,6 +102,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
}
// Save settings to a json file.
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "General exceptions will be logged until we can better understand runtime exception scenarios")]
public void SaveSettings(string jsonSettings, string powertoy = DefaultModuleName, string fileName = DefaultFileName)
{
try
@@ -114,8 +117,15 @@ namespace Microsoft.PowerToys.Settings.UI.Lib
_ioProvider.WriteAllText(GetSettingsPath(powertoy, fileName), jsonSettings);
}
}
- catch
+ catch (Exception e)
{
+ Logger.LogError($"Exception encountered while saving {powertoy} settings.", e);
+#if DEBUG
+ if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
+ {
+ throw;
+ }
+#endif
}
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideProperties.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideProperties.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideProperties.cs
index 38a46a0cbb..a0981dd797 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideProperties.cs
@@ -4,7 +4,7 @@
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ShortcutGuideProperties
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettings.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettings.cs
index 343649fd80..174aa4e217 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettings.cs
@@ -3,9 +3,9 @@
// See the LICENSE file in the project root for more information.
using System.Text.Json.Serialization;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ShortcutGuideSettings : BasePTModuleSettings, ISettingsConfig
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettingsIPCMessage.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettingsIPCMessage.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettingsIPCMessage.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettingsIPCMessage.cs
index 348e932f73..4ed1e0f672 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutGuideSettingsIPCMessage.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutGuideSettingsIPCMessage.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ShortcutGuideSettingsIPCMessage
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutsKeyDataModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutsKeyDataModel.cs
similarity index 60%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutsKeyDataModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutsKeyDataModel.cs
index 5195c6c1e9..812f595d65 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ShortcutsKeyDataModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ShortcutsKeyDataModel.cs
@@ -6,15 +6,22 @@ using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class ShortcutsKeyDataModel
{
+ // Suppressing these warnings because removing the setter breaks
+ // deserialization with System.Text.Json. This affects the UI display.
+ // See: https://github.com/dotnet/runtime/issues/30258
[JsonPropertyName("global")]
+#pragma warning disable CA2227 // Collection properties should be read only
public List GlobalRemapShortcuts { get; set; }
+#pragma warning restore CA2227 // Collection properties should be read only
[JsonPropertyName("appSpecific")]
+#pragma warning disable CA2227 // Collection properties should be read only
public List AppSpecificRemapShortcuts { get; set; }
+#pragma warning restore CA2227 // Collection properties should be read only
public ShortcutsKeyDataModel()
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndFancyZonesSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndFancyZonesSettings.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndFancyZonesSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndFancyZonesSettings.cs
index e644c985a5..aaf391b2c5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndFancyZonesSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndFancyZonesSettings.cs
@@ -4,7 +4,7 @@
using System.Text.Json;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndFancyZonesSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndImageResizerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndImageResizerSettings.cs
similarity index 92%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndImageResizerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndImageResizerSettings.cs
index 8092f3dd69..a62fccb21e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndImageResizerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndImageResizerSettings.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndImageResizerSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndKeyboardManagerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndKeyboardManagerSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndKeyboardManagerSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndKeyboardManagerSettings.cs
index 334233a2fd..ba3e7d8e25 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndKeyboardManagerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndKeyboardManagerSettings.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndKeyboardManagerSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndModuleSettings`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndModuleSettings`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs
index 8f51d25246..463ec535ad 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndModuleSettings`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
// Represents a powertoys module settings setnt to the runner.
public class SndModuleSettings
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerPreviewSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerPreviewSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerPreviewSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerPreviewSettings.cs
index 66101c1e02..b332a26ef0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerPreviewSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerPreviewSettings.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndPowerPreviewSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerRenameSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerRenameSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerRenameSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerRenameSettings.cs
index 781680f964..3382940668 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndPowerRenameSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndPowerRenameSettings.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndPowerRenameSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndShortcutGuideSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndShortcutGuideSettings.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/SndShortcutGuideSettings.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/SndShortcutGuideSettings.cs
index 19e1ca513f..70ada7f8fa 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/SndShortcutGuideSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/SndShortcutGuideSettings.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
public class SndShortcutGuideSettings
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/StringProperty.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/StringProperty.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/StringProperty.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/StringProperty.cs
index 6165d75448..c138424afb 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/StringProperty.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/StringProperty.cs
@@ -5,7 +5,7 @@
using System.Text.Json;
using System.Text.Json.Serialization;
-namespace Microsoft.PowerToys.Settings.UI.Lib
+namespace Microsoft.PowerToys.Settings.UI.Library
{
// Represents the configuration property of the settings that store string type.
public class StringProperty
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsBootEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsBootEvent.cs
similarity index 100%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsBootEvent.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsBootEvent.cs
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledEvent.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsEnabledEvent.cs
similarity index 100%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Telemetry/Events/SettingsEnabledEvent.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Telemetry/Events/SettingsEnabledEvent.cs
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Helper.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Helper.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Helper.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Helper.cs
index 71b3e47929..8cce1f2a68 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/Helper.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Helper.cs
@@ -7,9 +7,9 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
-using Microsoft.PowerToys.Settings.UI.Lib.CustomAction;
+using Microsoft.PowerToys.Settings.UI.Library.CustomAction;
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
{
public static class Helper
{
@@ -92,6 +92,15 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
{
// Split up the version strings into int[]
// Example: v10.0.2 -> {10, 0, 2};
+ if (version1 == null)
+ {
+ throw new ArgumentNullException(nameof(version1));
+ }
+ else if (version2 == null)
+ {
+ throw new ArgumentNullException(nameof(version2));
+ }
+
var v1 = version1.Substring(1).Split('.').Select(int.Parse).ToArray();
var v2 = version2.Substring(1).Split('.').Select(int.Parse).ToArray();
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/IIOProvider.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/IIOProvider.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/IIOProvider.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/IIOProvider.cs
index deed5f0fcd..dd448d76f2 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/IIOProvider.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/IIOProvider.cs
@@ -2,7 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
{
public interface IIOProvider
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs
new file mode 100644
index 0000000000..ebf9dc633c
--- /dev/null
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/Logger.cs
@@ -0,0 +1,65 @@
+// 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.Diagnostics;
+using System.Globalization;
+using System.IO;
+
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
+{
+ public static class Logger
+ {
+ private static readonly string ApplicationLogPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft\\PowerToys\\Settings Logs");
+
+ static Logger()
+ {
+ if (!Directory.Exists(ApplicationLogPath))
+ {
+ Directory.CreateDirectory(ApplicationLogPath);
+ }
+
+ var logFilePath = Path.Combine(ApplicationLogPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".txt");
+
+ Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
+
+ Trace.AutoFlush = true;
+ }
+
+ public static void LogInfo(string message)
+ {
+ Log(message, "INFO");
+ }
+
+ public static void LogError(string message, Exception e)
+ {
+ Log(
+ message + Environment.NewLine +
+ e?.Message + Environment.NewLine +
+ "Inner exception: " + Environment.NewLine +
+ e?.InnerException?.Message + Environment.NewLine +
+ "Stack trace: " + Environment.NewLine +
+ e?.StackTrace,
+ "ERROR");
+ }
+
+ private static void Log(string message, string type)
+ {
+ Trace.WriteLine(type + ": " + DateTime.Now.TimeOfDay);
+ Trace.Indent();
+ Trace.WriteLine(GetCallerInfo());
+ Trace.WriteLine(message);
+ Trace.Unindent();
+ }
+
+ private static string GetCallerInfo()
+ {
+ StackTrace stackTrace = new StackTrace();
+
+ var methodName = stackTrace.GetFrame(3)?.GetMethod();
+ var className = methodName?.DeclaringType.Name;
+ return "[Method]: " + methodName?.Name + " [Class]: " + className;
+ }
+ }
+}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/NativeMethods.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/NativeMethods.cs
similarity index 88%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/NativeMethods.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/NativeMethods.cs
index efd486abcc..6cc5ec90fa 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/NativeMethods.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/NativeMethods.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Text;
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
{
internal static class NativeMethods
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/SystemIOProvider.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs
similarity index 94%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/SystemIOProvider.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs
index bfcb4d55f7..c650c5957e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Utilities/SystemIOProvider.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/Utilities/SystemIOProvider.cs
@@ -4,7 +4,7 @@
using System.IO;
-namespace Microsoft.PowerToys.Settings.UI.Lib.Utilities
+namespace Microsoft.PowerToys.Settings.UI.Library.Utilities
{
public class SystemIOProvider : IIOProvider
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ColorPickerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
similarity index 85%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ColorPickerViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
index 5df080b77d..ff4f37f612 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ColorPickerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
@@ -3,11 +3,12 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Globalization;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class ColorPickerViewModel : Observable
{
@@ -24,6 +25,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
public ColorPickerViewModel(ISettingsUtils settingsUtils, ISettingsRepository settingsRepository, Func ipcMSGCallBackFunc)
{
// Obtain the general PowerToy settings configurations
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
@@ -121,8 +127,13 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private void NotifySettingsChanged()
{
+ // Using InvariantCulture as this is an IPC message
SendConfigMSG(
- string.Format("{{ \"powertoys\": {{ \"{0}\": {1} }} }}", ColorPickerSettings.ModuleName, JsonSerializer.Serialize(_colorPickerSettings)));
+ string.Format(
+ CultureInfo.InvariantCulture,
+ "{{ \"powertoys\": {{ \"{0}\": {1} }} }}",
+ ColorPickerSettings.ModuleName,
+ JsonSerializer.Serialize(_colorPickerSettings)));
}
}
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/ButtonClickCommand.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/ButtonClickCommand.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/ButtonClickCommand.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/ButtonClickCommand.cs
index 9ddf80cfe4..84f37b864a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/ButtonClickCommand.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/ButtonClickCommand.cs
@@ -5,7 +5,7 @@
using System;
using System.Windows.Input;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands
{
public class ButtonClickCommand : ICommand
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand.cs
index 0c2b5ef79f..2fe0be6692 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand.cs
@@ -5,7 +5,7 @@
using System;
using System.Windows.Input;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands
{
public class RelayCommand : ICommand
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand`1.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand`1.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand`1.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand`1.cs
index 22e2fed201..72bbebeb85 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/Commands/RelayCommand`1.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/Commands/RelayCommand`1.cs
@@ -5,7 +5,7 @@
using System;
using System.Windows.Input;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands
{
public class RelayCommand : ICommand
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/FancyZonesViewModel.cs
similarity index 81%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/FancyZonesViewModel.cs
index bf773a2649..5b13543a58 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/FancyZonesViewModel.cs
@@ -4,12 +4,13 @@
using System;
using System.Drawing;
+using System.Globalization;
using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class FancyZonesViewModel : Observable
{
@@ -28,10 +29,20 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
public FancyZonesViewModel(ISettingsRepository settingsRepository, ISettingsRepository moduleSettingsRepository, Func ipcMSGCallBackFunc, string configFileSubfolder = "")
{
// To obtain the general settings configurations of PowerToys Settings.
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
settingsConfigFileFolder = configFileSubfolder;
// To obtain the settings configurations of Fancy zones.
+ if (moduleSettingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(moduleSettingsRepository));
+ }
+
Settings = moduleSettingsRepository.SettingsConfig;
LaunchEditorEventHandler = new ButtonClickCommand(LaunchEditor);
@@ -137,7 +148,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_shiftDrag = value;
Settings.Properties.FancyzonesShiftDrag.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -155,7 +166,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_mouseSwitch = value;
Settings.Properties.FancyzonesMouseSwitch.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -178,7 +189,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_overrideSnapHotkeys = value;
Settings.Properties.FancyzonesOverrideSnapHotkeys.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
OnPropertyChanged(nameof(SnapHotkeysCategoryEnabled));
}
}
@@ -197,7 +208,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_moveWindowsAcrossMonitors = value;
Settings.Properties.FancyzonesMoveWindowsAcrossMonitors.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -215,7 +226,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_moveWindowsBasedOnPosition = value;
Settings.Properties.FancyzonesMoveWindowsBasedOnPosition.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -233,7 +244,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_displayChangemoveWindows = value;
Settings.Properties.FancyzonesDisplayChangeMoveWindows.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -251,7 +262,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_zoneSetChangeMoveWindows = value;
Settings.Properties.FancyzonesZoneSetChangeMoveWindows.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -269,7 +280,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_appLastZoneMoveWindows = value;
Settings.Properties.FancyzonesAppLastZoneMoveWindows.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -287,7 +298,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_openWindowOnActiveMonitor = value;
Settings.Properties.FancyzonesOpenWindowOnActiveMonitor.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -305,7 +316,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_restoreSize = value;
Settings.Properties.FancyzonesRestoreSize.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -323,7 +334,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_useCursorPosEditorStartupScreen = value;
Settings.Properties.UseCursorposEditorStartupscreen.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -341,7 +352,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_showOnAllMonitors = value;
Settings.Properties.FancyzonesShowOnAllMonitors.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -359,7 +370,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_spanZonesAcrossMonitors = value;
Settings.Properties.FancyzonesSpanZonesAcrossMonitors.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -377,11 +388,13 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_makeDraggedWindowTransparent = value;
Settings.Properties.FancyzonesMakeDraggedWindowTransparent.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
+ // For the following setters we use OrdinalIgnoreCase string comparison since
+ // we expect value to be a hex code.
public string ZoneHighlightColor
{
get
@@ -391,12 +404,15 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
set
{
- value = ToRGBHex(value);
- if (!value.Equals(_zoneHighlightColor))
+ // The fallback value is based on ToRGBHex's behavior, which returns
+ // #FFFFFF if any exceptions are encountered, e.g. from passing in a null value.
+ // This extra handling is added here to deal with FxCop warnings.
+ value = (value != null) ? ToRGBHex(value) : "#FFFFFF";
+ if (!value.Equals(_zoneHighlightColor, StringComparison.OrdinalIgnoreCase))
{
_zoneHighlightColor = value;
Settings.Properties.FancyzonesZoneHighlightColor.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -410,12 +426,15 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
set
{
- value = ToRGBHex(value);
+ // The fallback value is based on ToRGBHex's behavior, which returns
+ // #FFFFFF if any exceptions are encountered, e.g. from passing in a null value.
+ // This extra handling is added here to deal with FxCop warnings.
+ value = (value != null) ? ToRGBHex(value) : "#FFFFFF";
if (!value.Equals(_zoneBorderColor, StringComparison.OrdinalIgnoreCase))
{
_zoneBorderColor = value;
Settings.Properties.FancyzonesBorderColor.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -429,12 +448,15 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
set
{
- value = ToRGBHex(value);
- if (!value.Equals(_zoneInActiveColor))
+ // The fallback value is based on ToRGBHex's behavior, which returns
+ // #FFFFFF if any exceptions are encountered, e.g. from passing in a null value.
+ // This extra handling is added here to deal with FxCop warnings.
+ value = (value != null) ? ToRGBHex(value) : "#FFFFFF";
+ if (!value.Equals(_zoneInActiveColor, StringComparison.OrdinalIgnoreCase))
{
_zoneInActiveColor = value;
Settings.Properties.FancyzonesInActiveColor.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -452,7 +474,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_highlightOpacity = value;
Settings.Properties.FancyzonesHighlightOpacity.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -468,7 +490,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
if (value != _editorHotkey)
{
- if (value.IsEmpty())
+ if (value == null || value.IsEmpty())
{
_editorHotkey = FZConfigProperties.DefaultHotkeyValue;
}
@@ -478,7 +500,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
}
Settings.Properties.FancyzonesEditorHotkey.Value = _editorHotkey;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -496,7 +518,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_excludedApps = value;
Settings.Properties.FancyzonesExcludedApps.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -507,7 +529,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
SendConfigMSG("{\"action\":{\"FancyZones\":{\"action_name\":\"ToggledFZEditor\", \"value\":\"\"}}}");
}
- public void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+ public void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
{
OnPropertyChanged(propertyName);
if (SendConfigMSG != null)
@@ -520,13 +542,21 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private static string ToRGBHex(string color)
{
- try
+ // Using InvariantCulture as these are expected to be hex codes.
+ bool success = int.TryParse(
+ color.Replace("#", string.Empty),
+ System.Globalization.NumberStyles.HexNumber,
+ CultureInfo.InvariantCulture,
+ out int argb);
+
+ if (success)
{
- int argb = int.Parse(color.Replace("#", string.Empty), System.Globalization.NumberStyles.HexNumber);
Color clr = Color.FromArgb(argb);
- return "#" + clr.R.ToString("X2") + clr.G.ToString("X2") + clr.B.ToString("X2");
+ return "#" + clr.R.ToString("X2", CultureInfo.InvariantCulture) +
+ clr.G.ToString("X2", CultureInfo.InvariantCulture) +
+ clr.B.ToString("X2", CultureInfo.InvariantCulture);
}
- catch (Exception)
+ else
{
return "#FFFFFF";
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs
similarity index 80%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs
index df15756f79..b2e94bfce4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/GeneralViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/GeneralViewModel.cs
@@ -3,13 +3,14 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class GeneralViewModel : Observable
{
@@ -39,6 +40,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
RestartElevatedButtonEventHandler = new ButtonClickCommand(RestartElevated);
// To obtain the general settings configuration of PowerToys if it exists, else to create a new file and return the default configurations.
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
// set the callback functions value to hangle outgoing IPC message.
@@ -48,20 +54,25 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
// set the callback function value to update the UI theme.
UpdateUIThemeCallBack = updateTheme;
- UpdateUIThemeCallBack(GeneralSettingsConfig.Theme.ToLower());
+
+ UpdateUIThemeCallBack(GeneralSettingsConfig.Theme);
// Update Settings file folder:
_settingsConfigFileFolder = configFileSubfolder;
- switch (GeneralSettingsConfig.Theme.ToLower())
+ // Using Invariant here as these are internal strings and fxcop
+ // expects strings to be normalized to uppercase. While the theme names
+ // are represented in lowercase everywhere else, we'll use uppercase
+ // normalization for switch statements
+ switch (GeneralSettingsConfig.Theme.ToUpperInvariant())
{
- case "light":
+ case "LIGHT":
_isLightThemeRadioButtonChecked = true;
break;
- case "dark":
+ case "DARK":
_isDarkThemeRadioButtonChecked = true;
break;
- case "system":
+ case "SYSTEM":
_isSystemThemeRadioButtonChecked = true;
break;
}
@@ -102,7 +113,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
if (_packaged != value)
{
_packaged = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -121,7 +132,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_startup = value;
GeneralSettingsConfig.Startup = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -193,7 +204,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_runElevated = value;
GeneralSettingsConfig.RunElevated = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -220,11 +231,12 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_autoDownloadUpdates = value;
GeneralSettingsConfig.AutoDownloadUpdates = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "This may throw if the XAML page is not initialized in tests (https://github.com/microsoft/PowerToys/pull/2676)")]
public bool IsDarkThemeRadioButtonChecked
{
get
@@ -242,15 +254,17 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
UpdateUIThemeCallBack(GeneralSettingsConfig.Theme);
}
- catch
+ catch (Exception e)
{
+ Logger.LogError("Exception encountered when changing Settings theme", e);
}
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "This may throw if the XAML page is not initialized in tests (https://github.com/microsoft/PowerToys/pull/2676)")]
public bool IsLightThemeRadioButtonChecked
{
get
@@ -268,15 +282,17 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
UpdateUIThemeCallBack(GeneralSettingsConfig.Theme);
}
- catch
+ catch (Exception e)
{
+ Logger.LogError("Exception encountered when changing Settings theme", e);
}
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "This may throw if the XAML page is not initialized in tests (https://github.com/microsoft/PowerToys/pull/2676)")]
public bool IsSystemThemeRadioButtonChecked
{
get
@@ -294,11 +310,12 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
UpdateUIThemeCallBack(GeneralSettingsConfig.Theme);
}
- catch
+ catch (Exception e)
{
+ Logger.LogError("Exception encountered when changing Settings theme", e);
}
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -329,12 +346,12 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
if (_latestAvailableVersion != value)
{
_latestAvailableVersion = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
- public void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+ public void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
{
// Notify UI of property change
OnPropertyChanged(propertyName);
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs
similarity index 89%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs
index 44e564ad3b..fcede542e8 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ImageResizerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ImageResizerViewModel.cs
@@ -5,11 +5,14 @@
using System;
using System.Collections.ObjectModel;
using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
using System.Linq;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class ImageResizerViewModel : Observable
{
@@ -23,19 +26,32 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private Func SendConfigMSG { get; }
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exceptions should not crash the program but will be logged until we can understand common exception scenarios")]
public ImageResizerViewModel(ISettingsUtils settingsUtils, ISettingsRepository settingsRepository, Func ipcMSGCallBackFunc)
{
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
// To obtain the general settings configurations of PowerToys.
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
try
{
Settings = _settingsUtils.GetSettings(ModuleName);
}
- catch
+ catch (Exception e)
{
+ Logger.LogError($"Exception encountered while reading {ModuleName} settings.", e);
+#if DEBUG
+ if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
+ {
+ throw;
+ }
+#endif
Settings = new ImageResizerSettings();
_settingsUtils.SaveSettings(Settings.ToJsonString(), ModuleName);
}
@@ -92,13 +108,18 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
}
}
+#pragma warning disable CA2227 // Collection properties should be read only
public ObservableCollection Sizes
+#pragma warning restore CA2227 // Collection properties should be read only
{
get
{
return _advancedSizes;
}
+ // FxCop demands collection properties to be read-only, but this
+ // setter is used in autogenerated files (ImageResizerPage.g.cs)
+ // and replacing the setter with its own method will break the file
set
{
SavesImageSizes(value);
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/KeyboardManagerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
similarity index 70%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/KeyboardManagerViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
index 0e6d36f519..b94836f51a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/KeyboardManagerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/KeyboardManagerViewModel.cs
@@ -4,17 +4,18 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Input;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels.Commands;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class KeyboardManagerViewModel : Observable
{
@@ -41,8 +42,14 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private Func, int> FilterRemapKeysList { get; }
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exceptions should not crash the program but will be logged until we can understand common exception scenarios")]
public KeyboardManagerViewModel(ISettingsUtils settingsUtils, ISettingsRepository settingsRepository, Func ipcMSGCallBackFunc, Func, int> filterRemapKeysList)
{
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
// set the callback functions value to hangle outgoing IPC message.
@@ -53,8 +60,20 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
if (_settingsUtils.SettingsExists(PowerToyName))
{
- // Todo: Be more resilient while reading and saving settings.
- Settings = _settingsUtils.GetSettings(PowerToyName);
+ try
+ {
+ Settings = _settingsUtils.GetSettings(PowerToyName);
+ }
+ catch (Exception e)
+ {
+ Logger.LogError($"Exception encountered while reading {PowerToyName} settings.", e);
+#if DEBUG
+ if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
+ {
+ throw;
+ }
+#endif
+ }
// Load profile.
if (!LoadProfile())
@@ -107,7 +126,22 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
public static List CombineShortcutLists(List globalShortcutList, List appSpecificShortcutList)
{
- return globalShortcutList.ConvertAll(x => new AppSpecificKeysDataModel { OriginalKeys = x.OriginalKeys, NewRemapKeys = x.NewRemapKeys, TargetApp = "All Apps" }).Concat(appSpecificShortcutList).ToList();
+ if (globalShortcutList == null && appSpecificShortcutList == null)
+ {
+ return new List();
+ }
+ else if (globalShortcutList == null)
+ {
+ return appSpecificShortcutList;
+ }
+ else if (appSpecificShortcutList == null)
+ {
+ return globalShortcutList.ConvertAll(x => new AppSpecificKeysDataModel { OriginalKeys = x.OriginalKeys, NewRemapKeys = x.NewRemapKeys, TargetApp = "All Apps" }).ToList();
+ }
+ else
+ {
+ return globalShortcutList.ConvertAll(x => new AppSpecificKeysDataModel { OriginalKeys = x.OriginalKeys, NewRemapKeys = x.NewRemapKeys, TargetApp = "All Apps" }).Concat(appSpecificShortcutList).ToList();
+ }
}
public List RemapShortcuts
@@ -129,28 +163,31 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
public ICommand EditShortcutCommand => _editShortcutCommand ?? (_editShortcutCommand = new RelayCommand(OnEditShortcut));
+ // Note: FxCop suggests calling ConfigureAwait() for the following methods,
+ // and calling ConfigureAwait(true) has the same behavior as not explicitly
+ // calling it (continuations are scheduled on the task-creating thread)
private async void OnRemapKeyboard()
{
- await Task.Run(() => OnRemapKeyboardBackground());
+ await Task.Run(() => OnRemapKeyboardBackground()).ConfigureAwait(true);
}
private async void OnEditShortcut()
{
- await Task.Run(() => OnEditShortcutBackground());
+ await Task.Run(() => OnEditShortcutBackground()).ConfigureAwait(true);
}
private async Task OnRemapKeyboardBackground()
{
Helper.AllowRunnerToForeground();
SendConfigMSG(Helper.GetSerializedCustomAction(PowerToyName, RemapKeyboardActionName, RemapKeyboardActionValue));
- await Task.CompletedTask;
+ await Task.CompletedTask.ConfigureAwait(true);
}
private async Task OnEditShortcutBackground()
{
Helper.AllowRunnerToForeground();
SendConfigMSG(Helper.GetSerializedCustomAction(PowerToyName, EditShortcutActionName, EditShortcutActionValue));
- await Task.CompletedTask;
+ await Task.CompletedTask.ConfigureAwait(true);
}
public void NotifyFileChanged()
@@ -159,6 +196,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
OnPropertyChanged(nameof(RemapShortcuts));
}
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exceptions here (especially mutex errors) should not halt app execution, but they will be logged.")]
public bool LoadProfile()
{
var success = true;
@@ -198,9 +236,10 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
}
}
}
- catch (Exception)
+ catch (Exception e)
{
// Failed to load the configuration.
+ Logger.LogError($"Exception encountered when loading {PowerToyName} profile", e);
success = false;
}
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerLauncherViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
similarity index 91%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerLauncherViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
index 82af7c1b5d..89fe413ff4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerLauncherViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
@@ -3,12 +3,13 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Globalization;
using System.Runtime.CompilerServices;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class PowerLauncherViewModel : Observable
{
@@ -29,6 +30,11 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
// To obtain the general Settings configurations of PowerToys
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
// set the callback functions value to hangle outgoing IPC message.
@@ -36,8 +42,13 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
callback = (PowerLauncherSettings settings) =>
{
// Propagate changes to Power Launcher through IPC
+ // Using InvariantCulture as this is an IPC message
SendConfigMSG(
- string.Format("{{ \"powertoys\": {{ \"{0}\": {1} }} }}", PowerLauncherSettings.ModuleName, JsonSerializer.Serialize(settings)));
+ string.Format(
+ CultureInfo.InvariantCulture,
+ "{{ \"powertoys\": {{ \"{0}\": {1} }} }}",
+ PowerLauncherSettings.ModuleName,
+ JsonSerializer.Serialize(settings)));
};
if (_settingsUtils.SettingsExists(PowerLauncherSettings.ModuleName))
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerPreviewViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerPreviewViewModel.cs
similarity index 88%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerPreviewViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerPreviewViewModel.cs
index 981cb81406..911620fee1 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerPreviewViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerPreviewViewModel.cs
@@ -4,10 +4,10 @@
using System;
using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class PowerPreviewViewModel : Observable
{
@@ -27,10 +27,20 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
_settingsConfigFileFolder = configFileSubfolder;
// To obtain the general Settings configurations of PowerToys
+ if (generalSettingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(generalSettingsRepository));
+ }
+
GeneralSettingsConfig = generalSettingsRepository.SettingsConfig;
// To obtain the PowerPreview settings if it exists.
// If the file does not exist, to create a new one and return the default settings configurations.
+ if (moduleSettingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(moduleSettingsRepository));
+ }
+
Settings = moduleSettingsRepository.SettingsConfig;
// set the callback functions value to hangle outgoing IPC message.
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerRenameViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerRenameViewModel.cs
similarity index 87%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerRenameViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerRenameViewModel.cs
index e5b464c034..99ef38b1a9 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/PowerRenameViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerRenameViewModel.cs
@@ -3,11 +3,14 @@
// See the LICENSE file in the project root for more information.
using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class PowerRenameViewModel : Observable
{
@@ -23,12 +26,18 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
private Func SendConfigMSG { get; }
+ [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Exceptions should not crash the program but will be logged until we can understand common exception scenarios")]
public PowerRenameViewModel(ISettingsUtils settingsUtils, ISettingsRepository settingsRepository, Func ipcMSGCallBackFunc, string configFileSubfolder = "")
{
// Update Settings file folder:
_settingsConfigFileFolder = configFileSubfolder;
_settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(settingsRepository));
+ }
+
GeneralSettingsConfig = settingsRepository.SettingsConfig;
try
@@ -36,8 +45,15 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
PowerRenameLocalProperties localSettings = _settingsUtils.GetSettings(GetSettingsSubPath(), "power-rename-settings.json");
Settings = new PowerRenameSettings(localSettings);
}
- catch
+ catch (Exception e)
{
+ Logger.LogError($"Exception encountered while reading {ModuleName} settings.", e);
+#if DEBUG
+ if (e is ArgumentException || e is ArgumentNullException || e is PathTooLongException)
+ {
+ throw;
+ }
+#endif
PowerRenameLocalProperties localSettings = new PowerRenameLocalProperties();
Settings = new PowerRenameSettings(localSettings);
_settingsUtils.SaveSettings(localSettings.ToJsonString(), GetSettingsSubPath(), "power-rename-settings.json");
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ShortcutGuideViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ShortcutGuideViewModel.cs
similarity index 86%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ShortcutGuideViewModel.cs
rename to src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ShortcutGuideViewModel.cs
index 8be635dfa4..79072bba66 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/ShortcutGuideViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ShortcutGuideViewModel.cs
@@ -4,10 +4,10 @@
using System;
using System.Runtime.CompilerServices;
-using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
-namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
+namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
{
public class ShortcutGuideViewModel : Observable
{
@@ -27,10 +27,20 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
_settingsConfigFileFolder = configFileSubfolder;
// To obtain the general PowerToys settings.
+ if (settingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(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.
+ if (moduleSettingsRepository == null)
+ {
+ throw new ArgumentNullException(nameof(moduleSettingsRepository));
+ }
+
Settings = moduleSettingsRepository.SettingsConfig;
// set the callback functions value to hangle outgoing IPC message.
@@ -102,7 +112,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
// set theme to dark.
Settings.Properties.Theme.Value = "dark";
_themeIndex = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
if (value == 1)
@@ -110,7 +120,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
// set theme to light.
Settings.Properties.Theme.Value = "light";
_themeIndex = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
if (value == 2)
@@ -118,7 +128,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
// set theme to system default.
Settings.Properties.Theme.Value = "system";
_themeIndex = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -137,7 +147,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_pressTime = value;
Settings.Properties.PressTime.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -155,7 +165,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
{
_opacity = value;
Settings.Properties.OverlayOpacity.Value = value;
- RaisePropertyChanged();
+ NotifyPropertyChanged();
}
}
}
@@ -165,7 +175,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
return _settingsConfigFileFolder + "\\" + ModuleName;
}
- public void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+ public void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
{
OnPropertyChanged(propertyName);
SndShortcutGuideSettings outsettings = new SndShortcutGuideSettings(Settings);
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
index ff477163a5..38c02e694a 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs
@@ -30,6 +30,12 @@ namespace Microsoft.PowerToys.Settings.UI.Runner
private void WindowsXamlHost_ChildChanged(object sender, EventArgs e)
{
+ // If sender is null, it could lead to a NullReferenceException. This might occur on restarting as admin (check https://github.com/microsoft/PowerToys/issues/7393 for details)
+ if (sender == null)
+ {
+ return;
+ }
+
// Hook up x:Bind source.
WindowsXamlHost windowsXamlHost = sender as WindowsXamlHost;
ShellPage shellPage = windowsXamlHost.GetUwpInternalObject() as ShellPage;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj b/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
index 4b9d97f77e..f102c653e4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Runner/Microsoft.PowerToys.Settings.UI.Runner.csproj
@@ -75,7 +75,7 @@
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
index 15d954881b..28ed4f04bc 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/BackwardsCompatibility/BackCompatTestProperties.cs
@@ -1,6 +1,6 @@
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Moq;
using System;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj
index c3cde6c756..77c03e0bce 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Microsoft.PowerToys.Settings.UI.UnitTests.csproj
@@ -32,7 +32,7 @@
-
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs
index a7c6a4eaf4..9a0b7433ec 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/IIOProviderMocks.cs
@@ -1,4 +1,4 @@
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Moq;
using System;
using System.Collections.Generic;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs
index b1c47f15b1..d497dd4da4 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/Mocks/ISettingsUtilsMocks.cs
@@ -1,5 +1,5 @@
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
using Moq;
using System;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs
index 0ea3fe34fa..99555c4649 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTModuleSettingsTest.cs
@@ -3,8 +3,8 @@
// See the LICENSE file in the project root for more information.
using System;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.PowerToys.Settings.UnitTest;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs
index 023ee7e851..8d73d2a6ee 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/BasePTSettingsTest.cs
@@ -2,8 +2,8 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Interface;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
namespace Microsoft.PowerToys.Settings.UnitTest
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs
index f951bfb43b..dd362e38da 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/HelperTest.cs
@@ -3,7 +3,7 @@
// See the LICENSE file in the project root for more information.
using System;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace CommonLibTest
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs
index 5bb2825755..99501ff2e6 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsRepositoryTest.cs
@@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs
index 51606154d1..1289f7015d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ModelsTests/SettingsUtilsTests.cs
@@ -6,8 +6,8 @@ using System;
using System.IO;
using System.Linq;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.PowerToys.Settings.UnitTest;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs
index 4cadefcba3..cc649c441e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ColorPicker.cs
@@ -5,8 +5,8 @@
using System.Globalization;
using System.IO;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs
index 923fcc7013..8f87d1fe0b 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/FancyZones.cs
@@ -8,8 +8,8 @@ using System.Globalization;
using System.IO;
using System.Text.Json;
using CommonLibTest;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
index 85ff65bdde..bf543c8fcd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/General.cs
@@ -6,8 +6,8 @@ using System;
using System.Globalization;
using System.IO;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
index 74b61e89ea..5ebf32f6e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ImageResizer.cs
@@ -7,9 +7,9 @@ using System.Globalization;
using System.IO;
using System.Linq;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs
index f1888cbc41..16fa058dfc 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/KeyboardManager.cs
@@ -4,8 +4,8 @@
using System.Collections.Generic;
using System.Linq;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace ViewModelTests
@@ -41,6 +41,69 @@ namespace ViewModelTests
Assert.AreEqual(expectedResult.Count, result.Count);
}
+ [TestMethod]
+ public void CombineShortcutListsShouldReturnEmptyListWhenBothArgumentsAreNull()
+ {
+ // act
+ var result = KeyboardManagerViewModel.CombineShortcutLists(null, null);
+
+ // Assert
+ var expectedResult = new List();
+
+ Assert.AreEqual(expectedResult.Count, result.Count);
+ }
+
+ [TestMethod]
+ public void CombineShortcutListsShouldReturnListWithOneAppSpecificEntryWhenFirstArgumentIsNullAndSecondArgumentHasOneEntry()
+ {
+ // arrange
+ var secondList = new List();
+ var entry = new AppSpecificKeysDataModel();
+ entry.OriginalKeys = "17;65";
+ entry.NewRemapKeys = "17;86";
+ entry.TargetApp = "msedge";
+ secondList.Add(entry);
+
+ // act
+ var result = KeyboardManagerViewModel.CombineShortcutLists(null, secondList);
+
+ // Assert
+ var expectedResult = new List();
+ var expectedEntry = new AppSpecificKeysDataModel();
+ expectedEntry.OriginalKeys = entry.OriginalKeys;
+ expectedEntry.NewRemapKeys = entry.NewRemapKeys;
+ expectedEntry.TargetApp = entry.TargetApp;
+ expectedResult.Add(expectedEntry);
+
+ Assert.AreEqual(expectedResult.Count, result.Count);
+ Assert.IsTrue(expectedResult[0].Compare(result[0]));
+ }
+
+ [TestMethod]
+ public void CombineShortcutListsShouldReturnListWithOneAllAppsEntryWhenFirstArgumentHasOneEntryAndSecondArgumentIsNull()
+ {
+ // arrange
+ var firstList = new List();
+ var entry = new KeysDataModel();
+ entry.OriginalKeys = "17;65";
+ entry.NewRemapKeys = "17;86";
+ firstList.Add(entry);
+
+ // act
+ var result = KeyboardManagerViewModel.CombineShortcutLists(firstList, null);
+
+ // Assert
+ var expectedResult = new List();
+ var expectedEntry = new AppSpecificKeysDataModel();
+ expectedEntry.OriginalKeys = entry.OriginalKeys;
+ expectedEntry.NewRemapKeys = entry.NewRemapKeys;
+ expectedEntry.TargetApp = "All Apps";
+ expectedResult.Add(expectedEntry);
+
+ Assert.AreEqual(expectedResult.Count, result.Count);
+ Assert.IsTrue(expectedResult[0].Compare(result[0]));
+ }
+
[TestMethod]
public void CombineShortcutListsShouldReturnListWithOneAllAppsEntryWhenFirstArgumentHasOneEntryAndSecondArgumentIsEmpty()
{
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs
index 7a5c26649a..bd180e830c 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerLauncherViewModelTest.cs
@@ -2,8 +2,8 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using Moq;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs
index 4175bff6c0..d66a6839e0 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerPreview.cs
@@ -5,8 +5,8 @@
using System;
using System.IO;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs
index 99559ce12f..794dd1b972 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/PowerRename.cs
@@ -5,8 +5,8 @@
using System;
using System.IO;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs
index 0979abacdf..0e4fb665dd 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.UnitTests/ViewModelTests/ShortcutGuide.cs
@@ -5,8 +5,8 @@
using System;
using System.IO;
using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.ViewModels;
using Microsoft.PowerToys.Settings.UI.UnitTests.BackwardsCompatibility;
using Microsoft.PowerToys.Settings.UI.UnitTests.Mocks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
index 10d39ebfe2..b7540b907e 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Controls/HotkeySettingsControl.xaml.cs
@@ -4,7 +4,7 @@
using System;
using Microsoft.PowerToys.Settings.UI.Helpers;
-using Microsoft.PowerToys.Settings.UI.Lib;
+using Microsoft.PowerToys.Settings.UI.Library;
using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
@@ -229,7 +229,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
{
await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{
- KeyEventHandler(key, true, key, Lib.Utilities.Helper.GetKeyName((uint)key));
+ KeyEventHandler(key, true, key, Library.Utilities.Helper.GetKeyName((uint)key));
// Tab and Shift+Tab are accessible keys and should not be displayed in the hotkey control.
if (internalSettings.Code > 0 && !internalSettings.IsAccessibleShortcut())
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs b/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs
index 415fa97ba7..7b1feee775 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Converters/ModuleEnabledToForegroundConverter.cs
@@ -3,8 +3,8 @@
// See the LICENSE file in the project root for more information.
using System;
-using Microsoft.PowerToys.Settings.UI.Lib;
-using Microsoft.PowerToys.Settings.UI.Lib.Utilities;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Media;
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index b4c8952141..12e2281d14 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -289,9 +289,9 @@
{5d00d290-4016-4cfe-9e41-1e7c724509ba}
Telemetry
-
+
{b1bcc8c6-46b5-4bfa-8f22-20f32d99ec6a}
- Microsoft.PowerToys.Settings.UI.Lib
+ Microsoft.PowerToys.Settings.UI.Library
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 9e9762952c..fc053199a7 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -1,771 +1,777 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Microsoft.PowerToys.Settings.UI
- Application display name
-
-
- Microsoft.PowerToys.Settings.UI
- Application description
-
-
- Main
- Navigation view item name for Main
-
-
- General
- Navigation view item name for General
-
-
- PowerToys Run
- Navigation view item name for PowerToys Run
-
-
- PowerRename
- Navigation view item name for PowerRename
-
-
- Shortcut Guide
- Navigation view item name for Shortcut Guide
-
-
- File Explorer
- Navigation view item name for File Explorer Preview
-
-
- FancyZones
- Navigation view item name for FancyZones
-
-
- Image Resizer
- Navigation view item name for Image Resizer
-
-
- Color Picker
- Navigation view item name for Color Picker
-
-
- Keyboard Manager
- Navigation view item name for Keyboard Manager
-
-
- Current configuration
- Keyboard Manager current configuration header
-
-
- Reconfigure your keyboard by remapping keys and shortcuts.
- Keyboard Manager page description
-
-
- Enable Keyboard Manager
- Keyboard Manager enable toggle header
-
-
- Select the profile to display the active key remap and shortcuts
- Keyboard Manager configuration dropdown description
-
-
- Remap a key
- Keyboard Manager remap keyboard button content
-
-
- Remap keys
- Keyboard Manager remap keyboard header
-
-
- Remap a shortcut
- Keyboard Manager remap shortcuts button
-
-
- Remap shortcuts
- Keyboard Manager remap shortcuts header
-
-
- Current Key Remappings
-
-
- Current Shortcut Remappings
-
-
- Key remapping
-
-
- Shortcut remapping
-
-
- Remapped to
-
-
- Remapped to
-
-
- For Target Application
-
-
- Keyboard Manager
-
-
- Quick and simple system-wide color picker.
-
-
- Enable Color Picker
-
-
- Change cursor when picking a color
-
-
- Copied color representation
-
-
- Open Color Picker
-
-
- A quick launcher that has additional capabilities without sacrificing performance.
-
-
- Enable PowerToys Run
-
-
- Search & results
-
-
- Search result preference
-
-
- Most recently used
-
-
- Alphabetical order
-
-
- Running processes/open applications
-
-
- Search type preference
-
-
- Application name
-
-
- A string that is contained in the application
-
-
- Executable name
-
-
- Maximum number of results
-
-
- Shortcuts
-
-
- Open PowerToys Run
-
-
- Open file location
-
-
- Copy path location
-
-
- Open console
-
-
- Override Win+R shortcut
-
-
- Override Win+S shortcut
-
-
- Ignore shortcuts in fullscreen mode
-
-
- Disable drive detection warning for the indexer plugin
-
-
- Clear the previous query on launch
-
-
- To:
- Keyboard Manager mapping keys view right header
-
-
- About this feature
-
-
- Appearance
-
-
- FancyZones windows
-
-
- Create window layouts to help make multi-tasking easy.
-
-
- Keep windows in their zones when the screen resolution changes
-
-
- Enable FancyZones
-
-
- Excluded apps
-
-
- To exclude an application from snapping to zones add its name here (one per line). These apps will react only to Windows Snap.
-
-
- Zone highlight opacity
-
-
- Open zones editor
-
-
- Shortcut setting
-
-
- Information Symbol
-
-
- Launch zones editor
-
-
- Make dragged window transparent
-
-
- Use a non-primary mouse button to toggle zone activation
-
-
- Move windows between zones across all monitors
-
-
- Override Windows Snap shortcut (Win + Arrow) to move windows between zones
-
-
- Hold Shift key to activate zones while dragging
-
-
- Show zones on all monitors while dragging a window
-
-
- Move newly created windows to their last known zone
-
-
- Move newly created windows to the current active monitor (EXPERIMENTAL)
-
-
- Follow mouse cursor instead of focus when launching editor in a multi screen environment
-
-
- Zone behavior
-
-
- Zone highlight color (Default: #0078D7)
-
-
- During zone layout changes, windows assigned to a zone will match new size/positions
-
-
- Give feedback
-
-
- Module overview
-
-
- Attribution
-
-
- About PowerToys
-
-
- PowerToys Icon
-
-
- Check for updates
-
-
- Privacy statement
-
-
- Dark
-
-
- System default
-
-
- Light
-
-
- Report a bug
-
-
- Request a feature
-
-
- Restart as administrator
-
-
- Run at startup
-
-
- A Windows Shell extension for more advanced bulk renaming using search and replace or regular expressions.
-
-
- Shell integration
-
-
- Enable PowerRename
-
-
- Settings theme
-
-
- Show icon on context menu
-
-
- Appear only in extended context menu (Shift + Right-click)
-
-
- Maximum number of items
-
-
- Show values from last use
-
-
- Enable Markdown (.md) preview
-
-
- Enable SVG (.svg) preview
-
-
- Enable SVG (.svg) thumbnails
-
-
- These settings allow you to manage your Windows File Explorer custom preview handlers.
-
-
- Autocomplete
-
-
- Open-source notice
-
-
- Enable autocomplete for the search and replace fields
-
-
- Zone border color (Default: #FFFFFF)
-
-
- Zone inactive color (Default: #F5FCFF)
-
-
- Shows a help overlay with Windows shortcuts when the Windows key is pressed.
-
-
- Press duration before showing (ms)
-
-
- Appearance & behavior
-
-
- Enable Shortcut Guide
-
-
- Opacity of background
-
-
- Choose Shortcut Guide overlay color
-
-
- Image sizes
-
-
- Lets you resize images by right-clicking.
-
-
- Enable Image Resizer
-
-
- Image size
-
-
- Configurations
-
-
- Configuration Name
-
-
- Fit property
-
-
- Width property
-
-
- Height Property
-
-
- Size property
-
-
- Times symbol
-
-
- Remove
-
-
- Image Resizer
-
-
- Add size
-
-
- Save sizes
-
-
- JPEG quality level
-
-
- PNG interlacing
-
-
- TIFF compression
-
-
- File
-
-
- Default
-
-
- CCITT3
-
-
- CCITT4
-
-
- Default
-
-
- LZW
-
-
- None
-
-
- RLE
-
-
- Zip
-
-
- BMP encoder
-
-
- GIF encoder
-
-
- JPEG encoder
-
-
- PNG encoder
-
-
- TIFF encoder
-
-
- WMPhoto encoder
-
-
- Fill
-
-
- Fit
-
-
- Stretch
-
-
- Centimeters
-
-
- Inches
-
-
- Percent
-
-
- Pixels
-
-
- Off
-
-
- On
-
-
- Learn more about administrator mode
-
-
- Download updates automatically (Except on metered connections)
-
-
- Currently running as administrator
-
-
- Always run as administrator
-
-
- Running as user
-
-
- Running as administrator
-
-
- About FancyZones
-
-
- About File Explorer
-
-
- File Explorer
-
-
- About Image Resizer
-
-
- About Keyboard Manager
-
-
- About Color Picker
-
-
- Color Picker
-
-
- About PowerToys Run
-
-
- PowerToys Run
-
-
- About Power Rename
-
-
- Power Rename
-
-
- About Shortcut Guide
-
-
- Shortcut Guide
-
-
- GitHub repository
-
-
- Updates
-
-
- Version:
-
-
- Background theme
-
-
- Administrator mode
-
-
- You need to run as administrator to use this setting
-
-
- Only shortcuts with the following hotkeys are valid:
-
-
- Restore the original size of windows when unsnapping
-
-
- Fallback encoder
-
-
- The following parameters can be used:
-
-
- Filename format
-
-
- Use original date modified
-
-
- Encoding
-
-
- Remap keys to other keys or shortcuts.
-
-
- Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.
-
-
- Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.
-
-
- Allow zones to span across monitors (all monitors must have the same DPI scaling)
-
-
- Actual height
-
-
- Actual width
-
-
- Original filename
-
-
- Selected height
-
-
- Selected width
-
-
- Size name
-
-
- Move windows based on their position
-
-
- New update available
-
-
- You have the latest available version.
-
-
- Icon Preview
-
-
- Preview Pane
-
-
- You need to run as administrator to modify these settings
-
-
- The settings on this page affect all users on the system
-
-
- A reboot may be required for changes to these settings to take effect
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Microsoft.PowerToys.Settings.UI
+ Application display name
+
+
+ Microsoft.PowerToys.Settings.UI
+ Application description
+
+
+ Main
+ Navigation view item name for Main
+
+
+ General
+ Navigation view item name for General
+
+
+ PowerToys Run
+ Navigation view item name for PowerToys Run
+
+
+ PowerRename
+ Navigation view item name for PowerRename
+
+
+ Shortcut Guide
+ Navigation view item name for Shortcut Guide
+
+
+ File Explorer
+ Navigation view item name for File Explorer Preview
+
+
+ FancyZones
+ Navigation view item name for FancyZones
+
+
+ Image Resizer
+ Navigation view item name for Image Resizer
+
+
+ Color Picker
+ Navigation view item name for Color Picker
+
+
+ Keyboard Manager
+ Navigation view item name for Keyboard Manager
+
+
+ Current configuration
+ Keyboard Manager current configuration header
+
+
+ Reconfigure your keyboard by remapping keys and shortcuts.
+ Keyboard Manager page description
+
+
+ Enable Keyboard Manager
+ Keyboard Manager enable toggle header
+
+
+ Select the profile to display the active key remap and shortcuts
+ Keyboard Manager configuration dropdown description
+
+
+ Remap a key
+ Keyboard Manager remap keyboard button content
+
+
+ Remap keys
+ Keyboard Manager remap keyboard header
+
+
+ Remap a shortcut
+ Keyboard Manager remap shortcuts button
+
+
+ Remap shortcuts
+ Keyboard Manager remap shortcuts header
+
+
+ Current Key Remappings
+
+
+ Current Shortcut Remappings
+
+
+ Key remapping
+
+
+ Shortcut remapping
+
+
+ Remapped to
+
+
+ Remapped to
+
+
+ For Target Application
+
+
+ Keyboard Manager
+
+
+ Quick and simple system-wide color picker.
+
+
+ Enable Color Picker
+
+
+ Change cursor when picking a color
+
+
+ Copied color representation
+
+
+ Open Color Picker
+
+
+ A quick launcher that has additional capabilities without sacrificing performance.
+
+
+ Enable PowerToys Run
+
+
+ Search & results
+
+
+ Search result preference
+
+
+ Most recently used
+
+
+ Alphabetical order
+
+
+ Running processes/open applications
+
+
+ Search type preference
+
+
+ Application name
+
+
+ A string that is contained in the application
+
+
+ Executable name
+
+
+ Maximum number of results
+
+
+ Shortcuts
+
+
+ Open PowerToys Run
+
+
+ Open file location
+
+
+ Copy path location
+
+
+ Open console
+
+
+ Override Win+R shortcut
+
+
+ Override Win+S shortcut
+
+
+ Ignore shortcuts in fullscreen mode
+
+
+ Disable drive detection warning for the indexer plugin
+
+
+ Clear the previous query on launch
+
+
+ To:
+ Keyboard Manager mapping keys view right header
+
+
+ About this feature
+
+
+ Appearance
+
+
+ FancyZones windows
+
+
+ Create window layouts to help make multi-tasking easy.
+
+
+ Keep windows in their zones when the screen resolution changes
+
+
+ Enable FancyZones
+
+
+ Excluded apps
+
+
+ To exclude an application from snapping to zones add its name here (one per line). These apps will react only to Windows Snap.
+
+
+ Zone highlight opacity
+
+
+ Open zones editor
+
+
+ Shortcut setting
+
+
+ Information Symbol
+
+
+ Launch zones editor
+
+
+ Make dragged window transparent
+
+
+ Use a non-primary mouse button to toggle zone activation
+
+
+ Move windows between zones across all monitors
+
+
+ Override Windows Snap shortcut (Win + Arrow) to move windows between zones
+
+
+ Hold Shift key to activate zones while dragging
+
+
+ Show zones on all monitors while dragging a window
+
+
+ Move newly created windows to their last known zone
+
+
+ Move newly created windows to the current active monitor (EXPERIMENTAL)
+
+
+ Follow mouse cursor instead of focus when launching editor in a multi screen environment
+
+
+ Zone behavior
+
+
+ Zone highlight color (Default: #0078D7)
+
+
+ During zone layout changes, windows assigned to a zone will match new size/positions
+
+
+ Give feedback
+
+
+ Module overview
+
+
+ Attribution
+
+
+ About PowerToys
+
+
+ PowerToys Icon
+
+
+ Check for updates
+
+
+ Privacy statement
+
+
+ Dark
+
+
+ System default
+
+
+ Light
+
+
+ Report a bug
+
+
+ Request a feature
+
+
+ Restart as administrator
+
+
+ Run at startup
+
+
+ A Windows Shell extension for more advanced bulk renaming using search and replace or regular expressions.
+
+
+ Shell integration
+
+
+ Enable PowerRename
+
+
+ Settings theme
+
+
+ Show icon on context menu
+
+
+ Appear only in extended context menu (Shift + Right-click)
+
+
+ Maximum number of items
+
+
+ Show values from last use
+
+
+ Enable Markdown (.md) preview
+
+
+ Enable SVG (.svg) preview
+
+
+ Enable SVG (.svg) thumbnails
+
+
+ These settings allow you to manage your Windows File Explorer custom preview handlers.
+
+
+ Autocomplete
+
+
+ Open-source notice
+
+
+ Enable autocomplete for the search and replace fields
+
+
+ Zone border color (Default: #FFFFFF)
+
+
+ Zone inactive color (Default: #F5FCFF)
+
+
+ Shows a help overlay with Windows shortcuts when the Windows key is pressed.
+
+
+ Press duration before showing (ms)
+
+
+ Appearance & behavior
+
+
+ Enable Shortcut Guide
+
+
+ Opacity of background
+
+
+ Choose Shortcut Guide overlay color
+
+
+ Image sizes
+
+
+ Lets you resize images by right-clicking.
+
+
+ Enable Image Resizer
+
+
+ Image size
+
+
+ Configurations
+
+
+ Configuration Name
+
+
+ Fit property
+
+
+ Width property
+
+
+ Height Property
+
+
+ Size property
+
+
+ Times symbol
+
+
+ Remove
+
+
+ Image Resizer
+
+
+ Add size
+
+
+ Save sizes
+
+
+ JPEG quality level
+
+
+ PNG interlacing
+
+
+ TIFF compression
+
+
+ File
+
+
+ Default
+
+
+ CCITT3
+
+
+ CCITT4
+
+
+ Default
+
+
+ LZW
+
+
+ None
+
+
+ RLE
+
+
+ Zip
+
+
+ BMP encoder
+
+
+ GIF encoder
+
+
+ JPEG encoder
+
+
+ PNG encoder
+
+
+ TIFF encoder
+
+
+ WMPhoto encoder
+
+
+ Fill
+
+
+ Fit
+
+
+ Stretch
+
+
+ Centimeters
+
+
+ Inches
+
+
+ Percent
+
+
+ Pixels
+
+
+ Off
+
+
+ On
+
+
+ Learn more about administrator mode
+
+
+ Download updates automatically (Except on metered connections)
+
+
+ Currently running as administrator
+
+
+ Always run as administrator
+
+
+ Running as user
+
+
+ Running as administrator
+
+
+ About FancyZones
+
+
+ About File Explorer
+
+
+ File Explorer
+
+
+ About Image Resizer
+
+
+ About Keyboard Manager
+
+
+ About Color Picker
+
+
+ Color Picker
+
+
+ About PowerToys Run
+
+
+ PowerToys Run
+
+
+ About Power Rename
+
+
+ Power Rename
+
+
+ About Shortcut Guide
+
+
+ Shortcut Guide
+
+
+ GitHub repository
+
+
+ Updates
+
+
+ Version:
+
+
+ Background theme
+
+
+ Administrator mode
+
+
+ You need to run as administrator to use this setting
+
+
+ Only shortcuts with the following hotkeys are valid:
+
+
+ Restore the original size of windows when unsnapping
+
+
+ Fallback encoder
+
+
+ The following parameters can be used:
+
+
+ Filename format
+
+
+ Use original date modified
+
+
+ Encoding
+
+
+ Remap keys to other keys or shortcuts.
+
+
+ Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.
+
+
+ Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.
+
+
+ Allow zones to span across monitors (all monitors must have the same DPI scaling)
+
+
+ Actual height
+
+
+ Actual width
+
+
+ Original filename
+
+
+ Selected height
+
+
+ Selected width
+
+
+ Size name
+
+
+ Move windows based on their position
+
+
+ New update available
+
+
+ You have the latest available version.
+
+
+ Icon Preview
+
+
+ Preview Pane
+
+
+ You need to run as administrator to modify these settings
+
+
+ The settings on this page affect all users on the system
+
+
+ A reboot may be required for changes to these settings to take effect
+
+
+ Example: outlook.exe
+
+
+ Example: %1 (%2)
+
\ No newline at end of file
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
index 1ff3f00cc1..1a64bf15a5 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
@@ -50,12 +50,12 @@
IsOn="{Binding IsEnabled, Mode=TwoWay}"/>
+ SelectedIndex="{Binding CopiedColorRepresentationIndex, Mode=TwoWay}"
+ Margin="{StaticResource SmallTopMargin}"
+ IsEnabled="{Binding IsEnabled}"
+ HorizontalAlignment="Left"
+ MinWidth="240">
+
- ImageResizerUITest
- Microsoft Corp.
- Copyright (C) 2020 Microsoft Corp.
-
-
-
-
-
-
-
-
- Debug
- x64
+ netcoreapp3.1
{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}
Library
Properties
ImageResizer
ImageResizer.Test
- v4.7.2
- 512
-
-
+ Microsoft Corp.
+ Copyright (C) 2020 Microsoft Corp.
+ $(Version).0
+ $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\$(AssemblyName)\
+ ..\..\..\codeAnalysis\Rules.ruleset
+ x64
+
+
+
+ x64
true
$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\
-
- true
- full
- false
- $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\$(AssemblyName)\
- DEBUG;TRACE
- prompt
- 4
- false
- ..\..\..\codeAnalysis\Rules.ruleset
+
+
+ x64
-
- pdbonly
- true
- $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer\$(AssemblyName)\
- TRACE
- prompt
- 4
- false
- ..\..\..\codeAnalysis\Rules.ruleset
+
+ x64
+
-
-
-
- {2be46397-4dfa-414c-9bd4-41e4bbf8cb34}
- ImageResizerUI
-
+
-
-
-
- Designer
-
-
-
-
- Code
-
-
@@ -131,33 +61,18 @@
-
- 3.3.0
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
-
- 4.14.5
-
-
- 1.1.118
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
-
- 4.5.0
-
-
- 2.4.1
-
-
- 2.4.3
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
-
-
-
-
-
-
diff --git a/src/modules/imageresizer/ui/App.xaml b/src/modules/imageresizer/ui/App.xaml
index 22503f2c11..092f74ea24 100644
--- a/src/modules/imageresizer/ui/App.xaml
+++ b/src/modules/imageresizer/ui/App.xaml
@@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:m="clr-namespace:ImageResizer.Models"
- xmlns:sys="clr-namespace:System;assembly=mscorlib"
+ xmlns:sys="clr-namespace:System;assembly=System.Runtime"
xmlns:v="clr-namespace:ImageResizer.Views">
diff --git a/src/modules/imageresizer/ui/App.xaml.cs b/src/modules/imageresizer/ui/App.xaml.cs
index 02b7ecc3cb..1d6fba2cd5 100644
--- a/src/modules/imageresizer/ui/App.xaml.cs
+++ b/src/modules/imageresizer/ui/App.xaml.cs
@@ -5,7 +5,6 @@
using System;
using System.Text;
using System.Windows;
-using GalaSoft.MvvmLight.Threading;
using ImageResizer.Models;
using ImageResizer.Properties;
using ImageResizer.Utilities;
@@ -19,7 +18,6 @@ namespace ImageResizer
static App()
{
Console.InputEncoding = Encoding.Unicode;
- DispatcherHelper.Initialize();
}
protected override void OnStartup(StartupEventArgs e)
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Helpers/Observable.cs b/src/modules/imageresizer/ui/Helpers/Observable.cs
similarity index 93%
rename from src/core/Microsoft.PowerToys.Settings.UI.Lib/Helpers/Observable.cs
rename to src/modules/imageresizer/ui/Helpers/Observable.cs
index 918c5c531b..f631ca0ab3 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/Helpers/Observable.cs
+++ b/src/modules/imageresizer/ui/Helpers/Observable.cs
@@ -5,7 +5,7 @@
using System.ComponentModel;
using System.Runtime.CompilerServices;
-namespace Microsoft.PowerToys.Settings.UI.Lib.Helpers
+namespace ImageResizer.Helpers
{
public class Observable : INotifyPropertyChanged
{
diff --git a/src/modules/imageresizer/ui/Helpers/RelayCommand.cs b/src/modules/imageresizer/ui/Helpers/RelayCommand.cs
new file mode 100644
index 0000000000..39843ff837
--- /dev/null
+++ b/src/modules/imageresizer/ui/Helpers/RelayCommand.cs
@@ -0,0 +1,61 @@
+// 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.Windows.Input;
+
+namespace ImageResizer.Helpers
+{
+ public class RelayCommand : ICommand
+ {
+ private readonly Action _execute;
+ private readonly Func _canExecute;
+
+ public event EventHandler CanExecuteChanged;
+
+ public RelayCommand(Action execute)
+ : this(execute, null)
+ {
+ }
+
+ public RelayCommand(Action execute, Func canExecute)
+ {
+ _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+ _canExecute = canExecute;
+ }
+
+ public bool CanExecute(object parameter) => _canExecute == null || _canExecute();
+
+ public void Execute(object parameter) => _execute();
+
+ public void OnCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+ }
+
+ [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "abstract T and abstract")]
+ public class RelayCommand : ICommand
+ {
+ private readonly Action execute;
+
+ private readonly Func canExecute;
+
+ public event EventHandler CanExecuteChanged;
+
+ public RelayCommand(Action execute)
+ : this(execute, null)
+ {
+ }
+
+ public RelayCommand(Action execute, Func canExecute)
+ {
+ this.execute = execute ?? throw new ArgumentNullException(nameof(execute));
+ this.canExecute = canExecute;
+ }
+
+ public bool CanExecute(object parameter) => canExecute == null || canExecute((T)parameter);
+
+ public void Execute(object parameter) => execute((T)parameter);
+
+ public void OnCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+ }
+}
diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj
index 84fd5a84dc..58cfebf3b8 100644
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -1,193 +1,59 @@
-
-
-
ImageResizer
Microsoft Corp.
Copyright (C) 2019 Microsoft Corp.
+ ..\..\..\codeAnalysis\Rules.ruleset
+ $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer
+ false
+ false
+ true
+ x64
-
-
-
-
-
-
+
- Debug
- x64
+ x64
{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}
WinExe
ImageResizer
ImageResizer
- v4.7.2
- 512
+ netcoreapp3.1
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 4
-
-
true
$(SolutionDir)$(Platform)\$(Configuration)\obj\$(AssemblyName)\
-
- x64
- true
- full
- false
- $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer
- DEBUG;TRACE
- prompt
- 4
- false
- ..\..\..\codeAnalysis\Rules.ruleset
-
-
- x64
- pdbonly
- true
- $(SolutionDir)$(Platform)\$(Configuration)\modules\ImageResizer
- TRACE
- prompt
- 4
- false
- ..\..\..\codeAnalysis\Rules.ruleset
-
+
Resources\ImageResizer.ico
+ en-US
+
+
+ true
+ true
+ x64
+
+
+ true
+ false
+ x64
+
+
-
-
- MSBuild:Compile
- Designer
-
-
-
-
- AdvancedWindow.xaml
-
-
- ProgressPage.xaml
-
-
- ResultsPage.xaml
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
- MSBuild:Compile
- Designer
-
-
- App.xaml
- Code
-
-
- InputPage.xaml
-
-
- MainWindow.xaml
- Code
-
-
- Designer
- MSBuild:Compile
-
-
- Designer
- MSBuild:Compile
-
-
-
-
- Code
-
-
- True
- True
- Resources.resx
-
-
+
PublicResXFileCodeGenerator
Resources.Designer.cs
Designer
-
-
-
-
@@ -195,31 +61,23 @@
-
- 3.3.0
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
-
- 5.4.1.1
-
-
- 12.0.3
-
-
- 1.1.118
- runtime; build; native; contentfiles; analyzers; buildtransitive
+
all
-
- {f055103b-f80b-4d0c-bf48-057c55620033}
- interop
-
+
+
+
+ True
+ True
+ Resources.resx
+
-
- $(TargetFrameworkSDKToolsDirectory)$(Platform)\
-
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/Models/ResizeSize.cs b/src/modules/imageresizer/ui/Models/ResizeSize.cs
index f9d1145b65..bfc6aef1d2 100644
--- a/src/modules/imageresizer/ui/Models/ResizeSize.cs
+++ b/src/modules/imageresizer/ui/Models/ResizeSize.cs
@@ -4,14 +4,14 @@
using System.Collections.Generic;
using System.Diagnostics;
-using GalaSoft.MvvmLight;
+using ImageResizer.Helpers;
using ImageResizer.Properties;
using Newtonsoft.Json;
namespace ImageResizer.Models
{
[JsonObject(MemberSerialization.OptIn)]
- public class ResizeSize : ObservableObject
+ public class ResizeSize : Observable
{
private static readonly IDictionary _tokens = new Dictionary
{
@@ -45,7 +45,7 @@ namespace ImageResizer.Models
public virtual string Name
{
get => _name;
- set => Set(nameof(Name), ref _name, ReplaceTokens(value));
+ set => Set(ref _name, ReplaceTokens(value));
}
[JsonProperty(PropertyName = "fit")]
@@ -54,7 +54,8 @@ namespace ImageResizer.Models
get => _fit;
set
{
- if (Set(nameof(Fit), ref _fit, value))
+ Set(ref _fit, value);
+ if (!Equals(_fit, value))
{
UpdateShowHeight();
}
@@ -65,14 +66,14 @@ namespace ImageResizer.Models
public double Width
{
get => _width;
- set => Set(nameof(Width), ref _width, value);
+ set => Set(ref _width, value);
}
[JsonProperty(PropertyName = "height")]
public double Height
{
get => _height;
- set => Set(nameof(Height), ref _height, value);
+ set => Set(ref _height, value);
}
public bool ShowHeight
@@ -87,7 +88,8 @@ namespace ImageResizer.Models
get => _unit;
set
{
- if (Set(nameof(Unit), ref _unit, value))
+ Set(ref _unit, value);
+ if (!Equals(_unit, value))
{
UpdateShowHeight();
}
@@ -113,7 +115,6 @@ namespace ImageResizer.Models
private void UpdateShowHeight()
=> Set(
- nameof(ShowHeight),
ref _showHeight,
Fit == ResizeFit.Stretch || Unit != ResizeUnit.Percent);
diff --git a/src/modules/imageresizer/ui/Properties/Settings.cs b/src/modules/imageresizer/ui/Properties/Settings.cs
index ffb0f44146..e2d73a7fe5 100644
--- a/src/modules/imageresizer/ui/Properties/Settings.cs
+++ b/src/modules/imageresizer/ui/Properties/Settings.cs
@@ -2,6 +2,7 @@
// The Brice Lambson licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information. Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -65,14 +66,14 @@ namespace ImageResizer.Properties
public string FileNameFormat
=> _fileNameFormat
?? (_fileNameFormat = FileName
- .Replace("{", "{{")
- .Replace("}", "}}")
- .Replace("%1", "{0}")
- .Replace("%2", "{1}")
- .Replace("%3", "{2}")
- .Replace("%4", "{3}")
- .Replace("%5", "{4}")
- .Replace("%6", "{5}"));
+ .Replace("{", "{{", StringComparison.OrdinalIgnoreCase)
+ .Replace("}", "}}", StringComparison.OrdinalIgnoreCase)
+ .Replace("%1", "{0}", StringComparison.OrdinalIgnoreCase)
+ .Replace("%2", "{1}", StringComparison.OrdinalIgnoreCase)
+ .Replace("%3", "{2}", StringComparison.OrdinalIgnoreCase)
+ .Replace("%4", "{3}", StringComparison.OrdinalIgnoreCase)
+ .Replace("%5", "{4}", StringComparison.OrdinalIgnoreCase)
+ .Replace("%6", "{5}", StringComparison.OrdinalIgnoreCase));
public ResizeSize SelectedSize
{
diff --git a/src/modules/imageresizer/ui/ViewModels/AdvancedViewModel.cs b/src/modules/imageresizer/ui/ViewModels/AdvancedViewModel.cs
index 8348a667c6..db2b726060 100644
--- a/src/modules/imageresizer/ui/ViewModels/AdvancedViewModel.cs
+++ b/src/modules/imageresizer/ui/ViewModels/AdvancedViewModel.cs
@@ -7,14 +7,13 @@ using System.Collections.Generic;
using System.Reflection;
using System.Windows.Input;
using System.Windows.Media.Imaging;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Properties;
namespace ImageResizer.ViewModels
{
- public class AdvancedViewModel : ViewModelBase
+ public class AdvancedViewModel : Observable
{
private static Dictionary InitEncoderMap()
{
diff --git a/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs b/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs
index e863b5e8c4..6913e67867 100644
--- a/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs
+++ b/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs
@@ -4,15 +4,14 @@
// ShowAdvancedCommand = new RelayCommand(ShowAdvanced);
using System.Windows.Input;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Properties;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
- public class InputViewModel : ViewModelBase
+ public class InputViewModel : Observable
{
private readonly ResizeBatch _batch;
private readonly MainViewModel _mainViewModel;
diff --git a/src/modules/imageresizer/ui/ViewModels/MainViewModel.cs b/src/modules/imageresizer/ui/ViewModels/MainViewModel.cs
index a11f047161..8f335e4b1d 100644
--- a/src/modules/imageresizer/ui/ViewModels/MainViewModel.cs
+++ b/src/modules/imageresizer/ui/ViewModels/MainViewModel.cs
@@ -4,15 +4,14 @@
using System.Collections.Generic;
using System.Windows.Input;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Properties;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
- public class MainViewModel : ViewModelBase
+ public class MainViewModel : Observable
{
private readonly Settings _settings;
private readonly ResizeBatch _batch;
@@ -32,13 +31,13 @@ namespace ImageResizer.ViewModels
public object CurrentPage
{
get => _currentPage;
- set => Set(nameof(CurrentPage), ref _currentPage, value);
+ set => Set(ref _currentPage, value);
}
public double Progress
{
get => _progress;
- set => Set(nameof(Progress), ref _progress, value);
+ set => Set(ref _progress, value);
}
public void Load(IMainView view)
diff --git a/src/modules/imageresizer/ui/ViewModels/ProgressViewModel.cs b/src/modules/imageresizer/ui/ViewModels/ProgressViewModel.cs
index 7763eb961e..826041fc0a 100644
--- a/src/modules/imageresizer/ui/ViewModels/ProgressViewModel.cs
+++ b/src/modules/imageresizer/ui/ViewModels/ProgressViewModel.cs
@@ -8,14 +8,13 @@ using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Input;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
- public class ProgressViewModel : ViewModelBase, IDisposable
+ public class ProgressViewModel : Observable, IDisposable
{
private readonly MainViewModel _mainViewModel;
private readonly ResizeBatch _batch;
@@ -43,13 +42,13 @@ namespace ImageResizer.ViewModels
public double Progress
{
get => _progress;
- set => Set(nameof(Progress), ref _progress, value);
+ set => Set(ref _progress, value);
}
public TimeSpan TimeRemaining
{
get => _timeRemaining;
- set => Set(nameof(TimeRemaining), ref _timeRemaining, value);
+ set => Set(ref _timeRemaining, value);
}
public ICommand StartCommand { get; }
diff --git a/src/modules/imageresizer/ui/ViewModels/ResultsViewModel.cs b/src/modules/imageresizer/ui/ViewModels/ResultsViewModel.cs
index a15e57747d..39c49f8aa5 100644
--- a/src/modules/imageresizer/ui/ViewModels/ResultsViewModel.cs
+++ b/src/modules/imageresizer/ui/ViewModels/ResultsViewModel.cs
@@ -4,14 +4,13 @@
using System.Collections.Generic;
using System.Windows.Input;
-using GalaSoft.MvvmLight;
-using GalaSoft.MvvmLight.Command;
+using ImageResizer.Helpers;
using ImageResizer.Models;
using ImageResizer.Views;
namespace ImageResizer.ViewModels
{
- public class ResultsViewModel : ViewModelBase
+ public class ResultsViewModel : Observable
{
private readonly IMainView _mainView;
diff --git a/src/modules/imageresizer/ui/Views/MainWindow.xaml b/src/modules/imageresizer/ui/Views/MainWindow.xaml
index 466136a2c2..243e89048c 100644
--- a/src/modules/imageresizer/ui/Views/MainWindow.xaml
+++ b/src/modules/imageresizer/ui/Views/MainWindow.xaml
@@ -1,7 +1,7 @@
-
-
-
+
+
+
+
diff --git a/src/modules/imageresizer/ui/Views/ProgressPage.xaml b/src/modules/imageresizer/ui/Views/ProgressPage.xaml
index 72735f2c79..525969c91d 100644
--- a/src/modules/imageresizer/ui/Views/ProgressPage.xaml
+++ b/src/modules/imageresizer/ui/Views/ProgressPage.xaml
@@ -1,7 +1,7 @@
@@ -10,11 +10,11 @@
-
-
-
+
+
+
+
-
ToBoxValue(const std::vector& list)
+ Collections::IVector ToBoxValue(const std::vector>& list)
{
Collections::IVector boxList = single_threaded_vector();
for (auto& val : list)
{
- boxList.Append(winrt::box_value(val));
+ auto comboBox = ComboBoxItem();
+ comboBox.DataContext(winrt::box_value(std::to_wstring(val.first)));
+ comboBox.Content(winrt::box_value(val.second));
+ boxList.Append(winrt::box_value(comboBox));
}
return boxList;
@@ -324,7 +327,7 @@ namespace KeyboardManagerHelper
}
// Function to filter the key codes for artificial key codes
- DWORD FilterArtificialKeys(const DWORD& key)
+ int32_t FilterArtificialKeys(const int32_t& key)
{
switch (key)
{
@@ -345,57 +348,16 @@ namespace KeyboardManagerHelper
}
// Function to check if a modifier has been repeated in the previous drop downs
- bool CheckRepeatedModifier(std::vector& currentKeys, int selectedKeyIndex, const std::vector& keyCodeList)
+ bool CheckRepeatedModifier(const std::vector& currentKeys, int selectedKeyCode)
{
- // check if modifier has already been added before in a previous drop down
- int currentDropDownIndex = -1;
-
- // Find the key index of the current drop down selection so that we skip that index while searching for repeated modifiers
+ // Count the number of keys that are equal to 'selectedKeyCode'
+ int numberOfSameType = 0;
for (int i = 0; i < currentKeys.size(); i++)
{
- if (currentKeys[i] == keyCodeList[selectedKeyIndex])
- {
- currentDropDownIndex = i;
- break;
- }
+ numberOfSameType += KeyboardManagerHelper::GetKeyType(selectedKeyCode) == KeyboardManagerHelper::GetKeyType(currentKeys[i]);
}
- bool matchPreviousModifier = false;
- for (int i = 0; i < currentKeys.size(); i++)
- {
- // Skip the current drop down
- if (i != currentDropDownIndex)
- {
- // If the key type for the newly added key matches any of the existing keys in the shortcut
- if (KeyboardManagerHelper::GetKeyType(keyCodeList[selectedKeyIndex]) == KeyboardManagerHelper::GetKeyType(currentKeys[i]))
- {
- matchPreviousModifier = true;
- break;
- }
- }
- }
-
- return matchPreviousModifier;
- }
-
- // Function to get the selected key codes from the list of selected indices
- std::vector GetKeyCodesFromSelectedIndices(const std::vector& selectedIndices, const std::vector& keyCodeList)
- {
- std::vector keys;
-
- for (int i = 0; i < selectedIndices.size(); i++)
- {
- int selectedKeyIndex = selectedIndices[i];
- if (selectedKeyIndex != -1 && keyCodeList.size() > selectedKeyIndex)
- {
- // If None is not the selected key
- if (keyCodeList[selectedKeyIndex] != 0)
- {
- keys.push_back(keyCodeList[selectedKeyIndex]);
- }
- }
- }
-
- return keys;
+ // If we have at least two keys equal to 'selectedKeyCode' than modifier was repeated
+ return numberOfSameType > 1;
}
}
diff --git a/src/modules/keyboardmanager/common/Helpers.h b/src/modules/keyboardmanager/common/Helpers.h
index 927f765f6f..202b3a3af4 100644
--- a/src/modules/keyboardmanager/common/Helpers.h
+++ b/src/modules/keyboardmanager/common/Helpers.h
@@ -82,7 +82,7 @@ namespace KeyboardManagerHelper
winrt::hstring GetErrorMessage(ErrorType errorType);
// Function to return the list of key name in the order for the drop down based on the key codes
- winrt::Windows::Foundation::Collections::IVector ToBoxValue(const std::vector& list);
+ winrt::Windows::Foundation::Collections::IVector ToBoxValue(const std::vector>& list);
// Function to set the value of a key event based on the arguments
void SetKeyEvent(LPINPUT keyEventArray, int index, DWORD inputType, WORD keyCode, DWORD flags, ULONG_PTR extraInfo);
@@ -100,14 +100,11 @@ namespace KeyboardManagerHelper
void SetModifierKeyEvents(const Shortcut& shortcutToBeSent, const ModifierKey& winKeyInvoked, LPINPUT keyEventArray, int& index, bool isKeyDown, ULONG_PTR extraInfoFlag, const Shortcut& shortcutToCompare = Shortcut(), const DWORD& keyToBeReleased = NULL);
// Function to filter the key codes for artificial key codes
- DWORD FilterArtificialKeys(const DWORD& key);
+ int32_t FilterArtificialKeys(const int32_t& key);
// Function to sort a vector of shortcuts based on it's size
void SortShortcutVectorBasedOnSize(std::vector& shortcutVector);
// Function to check if a modifier has been repeated in the previous drop downs
- bool CheckRepeatedModifier(std::vector& currentKeys, int selectedKeyIndex, const std::vector& keyCodeList);
-
- // Function to get the selected key codes from the list of selected indices
- std::vector GetKeyCodesFromSelectedIndices(const std::vector& selectedIndices, const std::vector& keyCodeList);
+ bool CheckRepeatedModifier(const std::vector& currentKeys, int selectedKeyCodes);
}
\ No newline at end of file
diff --git a/src/modules/keyboardmanager/common/RemapShortcut.h b/src/modules/keyboardmanager/common/RemapShortcut.h
index a22ef83b45..b5bb283b19 100644
--- a/src/modules/keyboardmanager/common/RemapShortcut.h
+++ b/src/modules/keyboardmanager/common/RemapShortcut.h
@@ -9,14 +9,16 @@ public:
KeyShortcutUnion targetShortcut;
bool isShortcutInvoked;
ModifierKey winKeyInvoked;
+ // This bool value is only required for remapping shortcuts to Disable
+ bool isOriginalActionKeyPressed;
RemapShortcut(const KeyShortcutUnion& sc) :
- targetShortcut(sc), isShortcutInvoked(false), winKeyInvoked(ModifierKey::Disabled)
+ targetShortcut(sc), isShortcutInvoked(false), winKeyInvoked(ModifierKey::Disabled), isOriginalActionKeyPressed(false)
{
}
RemapShortcut() :
- targetShortcut(Shortcut()), isShortcutInvoked(false), winKeyInvoked(ModifierKey::Disabled)
+ targetShortcut(Shortcut()), isShortcutInvoked(false), winKeyInvoked(ModifierKey::Disabled), isOriginalActionKeyPressed(false)
{
}
diff --git a/src/modules/keyboardmanager/common/Shortcut.cpp b/src/modules/keyboardmanager/common/Shortcut.cpp
index 8ebed5f337..26542dc4e1 100644
--- a/src/modules/keyboardmanager/common/Shortcut.cpp
+++ b/src/modules/keyboardmanager/common/Shortcut.cpp
@@ -18,7 +18,7 @@ Shortcut::Shortcut(const std::wstring& shortcutVK) :
}
// Constructor to initialize shortcut from a list of keys
-Shortcut::Shortcut(const std::vector& keys)
+Shortcut::Shortcut(const std::vector& keys)
{
SetKeyCodes(keys);
}
@@ -505,12 +505,15 @@ std::vector Shortcut::GetKeyCodes()
}
// Function to set a shortcut from a vector of key codes
-void Shortcut::SetKeyCodes(const std::vector& keys)
+void Shortcut::SetKeyCodes(const std::vector& keys)
{
Reset();
for (int i = 0; i < keys.size(); i++)
{
- SetKey(keys[i]);
+ if (keys[i] != -1 && keys[i] != 0)
+ {
+ SetKey(keys[i]);
+ }
}
}
@@ -649,10 +652,13 @@ bool IgnoreKeyCode(DWORD key)
// Unassigned keys
bool isUnassigned = in_range(key, 0x88, 0x8F) || in_range(key, 0x97, 0x9F) || in_range(key, 0xD8, 0xDA) || equals(key, 0xE8);
- //OEM Specific keys. Ignore these key codes as some of them are used by IME keyboards. More information at https://github.com/microsoft/PowerToys/issues/5225
+ // OEM Specific keys. Ignore these key codes as some of them are used by IME keyboards. More information at https://github.com/microsoft/PowerToys/issues/5225
bool isOEMSpecific = in_range(key, 0x92, 0x96) || equals(key, 0xE1) || in_range(key, 0xE3, 0xE4) || equals(key, 0xE6) || in_range(key, 0xE9, 0xF5);
- if (isUndefined || isReserved || isUnassigned || isOEMSpecific)
+ // IME keys. Ignore these key codes as some of them are used by IME keyboards. More information at https://github.com/microsoft/PowerToys/issues/6951
+ bool isIME = in_range(key, VK_KANA, 0x1A) || in_range(key, VK_CONVERT, VK_MODECHANGE) || equals(key, VK_PROCESSKEY);
+
+ if (isUndefined || isReserved || isUnassigned || isOEMSpecific || isIME)
{
return true;
}
diff --git a/src/modules/keyboardmanager/common/Shortcut.h b/src/modules/keyboardmanager/common/Shortcut.h
index a86628c4c2..c4ae23ea0f 100644
--- a/src/modules/keyboardmanager/common/Shortcut.h
+++ b/src/modules/keyboardmanager/common/Shortcut.h
@@ -28,7 +28,7 @@ public:
Shortcut(const std::wstring& shortcutVK);
// Constructor to initialize shortcut from a list of keys
- Shortcut(const std::vector& keys);
+ Shortcut(const std::vector& keys);
// == operator
inline bool operator==(const Shortcut& sc) const
@@ -153,7 +153,7 @@ public:
std::vector GetKeyCodes();
// Function to set a shortcut from a vector of key codes
- void SetKeyCodes(const std::vector& keys);
+ void SetKeyCodes(const std::vector& keys);
// Function to check if all the modifiers in the shortcut have been pressed down
bool CheckModifiersKeyboardState(InputInterface& ii) const;
diff --git a/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp b/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp
index 013d77860f..bb7e33ee48 100644
--- a/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp
+++ b/src/modules/keyboardmanager/dll/KeyboardEventHandlers.cpp
@@ -40,7 +40,7 @@ namespace KeyboardEventHandlers
}
else
{
- key_count = std::get(it->second).Size() + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
+ key_count = std::get(it->second).Size();
}
LPINPUT keyEventList = new INPUT[size_t(key_count)]();
memset(keyEventList, 0, sizeof(keyEventList));
@@ -82,11 +82,11 @@ namespace KeyboardEventHandlers
KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)targetShortcut.GetActionKey(), KEYEVENTF_KEYUP, KeyboardManagerConstants::KEYBOARDMANAGER_SINGLEKEY_FLAG);
i++;
KeyboardManagerHelper::SetModifierKeyEvents(targetShortcut, ModifierKey::Disabled, keyEventList, i, false, KeyboardManagerConstants::KEYBOARDMANAGER_SINGLEKEY_FLAG);
- KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SINGLEKEY_FLAG);
+ // Dummy key is not required here since SetModifierKeyEvents will only add key-up events for the modifiers here, and the action key key-up is already sent before it
}
else
{
- KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SINGLEKEY_FLAG);
+ // Dummy key is not required here since SetModifierKeyEvents will only add key-down events for the modifiers here, and the action key key-down is already sent after it
KeyboardManagerHelper::SetModifierKeyEvents(targetShortcut, ModifierKey::Disabled, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SINGLEKEY_FLAG);
KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)targetShortcut.GetActionKey(), 0, KeyboardManagerConstants::KEYBOARDMANAGER_SINGLEKEY_FLAG);
i++;
@@ -248,7 +248,7 @@ namespace KeyboardEventHandlers
keyEventList = new INPUT[key_count]();
memset(keyEventList, 0, sizeof(keyEventList));
- // Send dummy key
+ // Send a dummy key event to prevent modifier press+release from being triggered. Example: Win+A->Ctrl+V, press Win+A, since Win will be released here we need to send a dummy event before it
int i = 0;
KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
@@ -279,12 +279,14 @@ namespace KeyboardEventHandlers
if (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
{
key_count--;
+ // Since the original shortcut's action key is pressed, set it to true
+ it->second.isOriginalActionKeyPressed = true;
}
keyEventList = new INPUT[key_count]();
memset(keyEventList, 0, sizeof(keyEventList));
- // Send dummy key
+ // Send a dummy key event to prevent modifier press+release from being triggered. Example: Win+A->V, press Win+A, since Win will be released here we need to send a dummy event before it
int i = 0;
KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
@@ -345,18 +347,18 @@ namespace KeyboardEventHandlers
// if the released key is present in both shortcuts' modifiers (i.e part of the common modifiers)
if (std::get(it->second.targetShortcut).CheckWinKey(data->lParam->vkCode) || std::get(it->second.targetShortcut).CheckCtrlKey(data->lParam->vkCode) || std::get(it->second.targetShortcut).CheckAltKey(data->lParam->vkCode) || std::get(it->second.targetShortcut).CheckShiftKey(data->lParam->vkCode))
{
- // release all new shortcut keys and the common released modifier except the other common modifiers, and add all original shortcut modifiers except the common ones
- key_count = (dest_size - commonKeys) + (src_size - 1 - commonKeys);
+ // release all new shortcut keys and the common released modifier except the other common modifiers, and add all original shortcut modifiers except the common ones, and dummy key
+ key_count = (dest_size - commonKeys) + (src_size - 1 - commonKeys) + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
}
else
{
- // release all new shortcut keys except the common modifiers and add all original shortcut modifiers except the common ones
- key_count = (dest_size - 1) + (src_size - 2) - (2 * (size_t)commonKeys);
+ // release all new shortcut keys except the common modifiers and add all original shortcut modifiers except the common ones, and dummy key
+ key_count = (dest_size - 1) + (src_size - 2) - (2 * (size_t)commonKeys) + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
}
// If the target shortcut's action key is pressed, then it should be released
bool isActionKeyPressed = false;
- if (GetAsyncKeyState(std::get(it->second.targetShortcut).GetActionKey()) & 0x8000)
+ if (ii.GetVirtualKeyState((std::get(it->second.targetShortcut).GetActionKey())))
{
isActionKeyPressed = true;
key_count += 1;
@@ -376,23 +378,37 @@ namespace KeyboardEventHandlers
// Set original shortcut key down state except the action key and the released modifier since the original action key may or may not be held down. If it is held down it will generate it's own key message
KeyboardManagerHelper::SetModifierKeyEvents(it->first, it->second.winKeyInvoked, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG, std::get(it->second.targetShortcut), data->lParam->vkCode);
+
+ // Send a dummy key event to prevent modifier press+release from being triggered. Example: Win+Ctrl+A->Ctrl+V, press Win+Ctrl+A and release A then Ctrl, since Win will be pressed here we need to send a dummy event after it
+ KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
}
else
{
- // 1 for releasing new key and original shortcut modifiers except the one released
- key_count = dest_size + src_size - 2;
+ // 1 for releasing new key and original shortcut modifiers except the one released and dummy key
+ key_count = dest_size + src_size - 2 + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
+ bool isTargetKeyPressed = false;
+
// Do not send Disable key up
if (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
{
key_count--;
}
+ else if (ii.GetVirtualKeyState(KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut))))
+ {
+ isTargetKeyPressed = true;
+ }
+ else
+ {
+ isTargetKeyPressed = false;
+ key_count--;
+ }
keyEventList = new INPUT[key_count]();
memset(keyEventList, 0, sizeof(keyEventList));
// Release new key state
int i = 0;
- if (std::get(it->second.targetShortcut) != CommonSharedConstants::VK_DISABLED)
+ if (std::get(it->second.targetShortcut) != CommonSharedConstants::VK_DISABLED && isTargetKeyPressed)
{
KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)), KEYEVENTF_KEYUP, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
i++;
@@ -400,10 +416,15 @@ namespace KeyboardEventHandlers
// Set original shortcut key down state except the action key and the released modifier since the original action key may or may not be held down. If it is held down it will generate it's own key message
KeyboardManagerHelper::SetModifierKeyEvents(it->first, it->second.winKeyInvoked, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG, Shortcut(), data->lParam->vkCode);
+
+ // Send a dummy key event to prevent modifier press+release from being triggered. Example: Win+Ctrl+A->V, press Win+Ctrl+A and release A then Ctrl, since Win will be pressed here we need to send a dummy event after it
+ KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
}
+ // Reset the remap state
it->second.isShortcutInvoked = false;
it->second.winKeyInvoked = ModifierKey::Disabled;
+ it->second.isOriginalActionKeyPressed = false;
// If app specific shortcut has finished invoking, reset the target application
if (activatedApp)
{
@@ -428,6 +449,8 @@ namespace KeyboardEventHandlers
// In case of mapping to disable do not send anything
if (!remapToShortcut && std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
{
+ // Since the original shortcut's action key is pressed, set it to true
+ it->second.isOriginalActionKeyPressed = true;
return 1;
}
@@ -443,13 +466,12 @@ namespace KeyboardEventHandlers
KeyboardManagerHelper::SetKeyEvent(keyEventList, 0, INPUT_KEYBOARD, (WORD)KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)), 0, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
}
- it->second.isShortcutInvoked = true;
UINT res = ii.SendVirtualInput((UINT)key_count, keyEventList, sizeof(INPUT));
delete[] keyEventList;
return 1;
}
- // Case 3: If the action key is released from the original shortcut keep modifiers of the new shortcut until some other key event which doesn't apply to the original shortcut
+ // Case 3: If the action key is released from the original shortcut, keep modifiers of the new shortcut until some other key event which doesn't apply to the original shortcut
if (data->lParam->vkCode == it->first.GetActionKey() && (data->wParam == WM_KEYUP || data->wParam == WM_SYSKEYUP))
{
size_t key_count = 1;
@@ -459,44 +481,54 @@ namespace KeyboardEventHandlers
keyEventList = new INPUT[key_count]();
memset(keyEventList, 0, sizeof(keyEventList));
KeyboardManagerHelper::SetKeyEvent(keyEventList, 0, INPUT_KEYBOARD, (WORD)std::get(it->second.targetShortcut).GetActionKey(), KEYEVENTF_KEYUP, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
- it->second.isShortcutInvoked = true;
}
-
- // for remap from shortcut to key, when the action key is released, the remap invoke is completed so revert to original shortcut state
+ // If remapped to disable, do nothing and suppress the key event
+ else if (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
+ {
+ // Since the original shortcut's action key is released, set it to false
+ it->second.isOriginalActionKeyPressed = false;
+ return 1;
+ }
else
{
- // 1 for releasing new key and original shortcut modifiers, and dummy key
- key_count = dest_size + (src_size - 1) + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
- // Do not send Disable key
- if (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
+ // Check if the keyboard state is clear apart from the target remap key (by creating a temp Shortcut object with the target key)
+ bool isKeyboardStateClear = Shortcut(std::vector({ KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)) })).IsKeyboardStateClearExceptShortcut(ii);
+ // If the keyboard state is clear, we release the target key but do not reset the remap state
+ if (isKeyboardStateClear)
{
- key_count--;
+ keyEventList = new INPUT[key_count]();
+ memset(keyEventList, 0, sizeof(keyEventList));
+ KeyboardManagerHelper::SetKeyEvent(keyEventList, 0, INPUT_KEYBOARD, (WORD)KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)), KEYEVENTF_KEYUP, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
}
-
- keyEventList = new INPUT[key_count]();
- memset(keyEventList, 0, sizeof(keyEventList));
-
- // Release new key state
- int i = 0;
- // Do not send Disable key
- if (std::get(it->second.targetShortcut) != CommonSharedConstants::VK_DISABLED)
+ // If any other key is pressed, then the keyboard state must be reverted back to the physical keys. This is to take cases like Ctrl+A->D remap and user presses B+Ctrl+A and releases A, or Ctrl+A+B and releases A
+ else
{
+ // 1 for releasing new key and original shortcut modifiers, and dummy key
+ key_count = dest_size + (src_size - 1) + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
+
+ keyEventList = new INPUT[key_count]();
+ memset(keyEventList, 0, sizeof(keyEventList));
+
+ // Release new key state
+ int i = 0;
KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)), KEYEVENTF_KEYUP, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
i++;
- }
- // Set original shortcut key down state except the action key and the released modifier
- KeyboardManagerHelper::SetModifierKeyEvents(it->first, it->second.winKeyInvoked, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
+ // Set original shortcut key down state except the action key
+ KeyboardManagerHelper::SetModifierKeyEvents(it->first, it->second.winKeyInvoked, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
- // Send dummy key
- KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
+ // Send a dummy key event to prevent modifier press+release from being triggered. Example: Win+A->V, press Shift+Win+A and release A, since Win will be pressed here we need to send a dummy event after it
+ KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
- it->second.isShortcutInvoked = false;
- it->second.winKeyInvoked = ModifierKey::Disabled;
- // If app specific shortcut has finished invoking, reset the target application
- if (activatedApp)
- {
- keyboardManagerState.SetActivatedApp(KeyboardManagerConstants::NoActivatedApp);
+ // Reset the remap state
+ it->second.isShortcutInvoked = false;
+ it->second.winKeyInvoked = ModifierKey::Disabled;
+ it->second.isOriginalActionKeyPressed = false;
+ // If app specific shortcut has finished invoking, reset the target application
+ if (activatedApp != KeyboardManagerConstants::NoActivatedApp)
+ {
+ keyboardManagerState.SetActivatedApp(KeyboardManagerConstants::NoActivatedApp);
+ }
}
}
@@ -510,19 +542,21 @@ namespace KeyboardEventHandlers
{
if (remapToShortcut)
{
- it->second.isShortcutInvoked = true;
-
// Modifier state reset might be required for this key depending on the target shortcut action key - ex: Ctrl+A -> Win+Caps
if (std::get(it->second.targetShortcut).GetCtrlKey() == NULL && std::get(it->second.targetShortcut).GetAltKey() == NULL && std::get(it->second.targetShortcut).GetShiftKey() == NULL)
{
ResetIfModifierKeyForLowerLevelKeyHandlers(ii, data->lParam->vkCode, std::get(it->second.targetShortcut).GetActionKey());
- return 1;
}
}
- else if (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
+ // If it is not remapped to Disable
+ else if (std::get(it->second.targetShortcut) != CommonSharedConstants::VK_DISABLED)
{
- return 1;
+ // Modifier state reset might be required for this key depending on the target key - ex: Ctrl+A -> Caps
+ ResetIfModifierKeyForLowerLevelKeyHandlers(ii, data->lParam->vkCode, KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)));
}
+
+ // Suppress the modifier as it is already physically pressed
+ return 1;
}
// Case 5: If any key apart from the action key or a modifier key in the original shortcut is pressed then revert the keyboard state to just the original modifiers being held down along with the current key press
@@ -542,11 +576,11 @@ namespace KeyboardEventHandlers
// If the original shortcut is a subset of the new shortcut
if (commonKeys == src_size - 1)
{
- key_count = dest_size - commonKeys + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE;
+ key_count = dest_size - commonKeys;
// If the target shortcut's action key is pressed, then it should be released and original shortcut's action key should be set
bool isActionKeyPressed = false;
- if (GetAsyncKeyState(std::get(it->second.targetShortcut).GetActionKey()) & 0x8000)
+ if (ii.GetVirtualKeyState((std::get(it->second.targetShortcut).GetActionKey())))
{
isActionKeyPressed = true;
key_count += 2;
@@ -574,17 +608,16 @@ namespace KeyboardEventHandlers
KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)data->lParam->vkCode, 0, 0);
i++;
- // Send dummy key since the current key pressed could be a modifier
- KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
+ // Do not send a dummy key as we want the current key press to behave as normal i.e. it can do press+release functionality if required. Required to allow a shortcut to Win key remap invoked directly after shortcut to shortcut is released to open start menu
}
else
{
- // Key up for all new shortcut keys, key down for original shortcut modifiers, dummy key and current key press but common keys aren't repeated
- key_count = (dest_size) + (src_size - 1) + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE - (2 * (size_t)commonKeys);
+ // Key up for all new shortcut keys, key down for original shortcut modifiers and current key press but common keys aren't repeated
+ key_count = (dest_size) + (src_size - 1) - (2 * (size_t)commonKeys);
// If the target shortcut's action key is pressed, then it should be released and original shortcut's action key should be set
bool isActionKeyPressed = false;
- if (GetAsyncKeyState(std::get(it->second.targetShortcut).GetActionKey()) & 0x8000)
+ if (ii.GetVirtualKeyState((std::get(it->second.targetShortcut).GetActionKey())))
{
isActionKeyPressed = true;
key_count += 2;
@@ -616,12 +649,13 @@ namespace KeyboardEventHandlers
KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)data->lParam->vkCode, 0, 0);
i++;
- // Send dummy key
- KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
+ // Do not send a dummy key as we want the current key press to behave as normal i.e. it can do press+release functionality if required. Required to allow a shortcut to Win key remap invoked directly after shortcut to shortcut is released to open start menu
}
+ // Reset the remap state
it->second.isShortcutInvoked = false;
it->second.winKeyInvoked = ModifierKey::Disabled;
+ it->second.isOriginalActionKeyPressed = false;
// If app specific shortcut has finished invoking, reset the target application
if (activatedApp)
{
@@ -632,44 +666,79 @@ namespace KeyboardEventHandlers
delete[] keyEventList;
return 1;
}
- // All modifier keys and action key will be pressed down because if they are not pressed that means that handler has already been invoked on key release
- else if (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED)
+ // For remap to key, if the original action key is not currently pressed, we should revert the keyboard state to the physical keys. If it is pressed we should not suppress the event so that shortcut to key remaps can be pressed with other keys. Example use-case: Alt+D->Win, allows Alt+D+A to perform Win+A
+ else
{
- // Key down for original shortcut modifiers and action key, dummy key, and current key press
- size_t key_count = src_size + KeyboardManagerConstants::DUMMY_KEY_EVENT_SIZE + 1;
+ // Modifier state reset might be required for this key depending on the target key - ex: Ctrl+A -> Caps, Shift is pressed. System should not see Shift and Caps pressed together
+ ResetIfModifierKeyForLowerLevelKeyHandlers(ii, data->lParam->vkCode, KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)));
- LPINPUT keyEventList = new INPUT[key_count]();
- memset(keyEventList, 0, sizeof(keyEventList));
+ // If the shortcut is remapped to Disable then we have to revert the keyboard state to the physical keys
+ bool isRemapToDisable = (std::get(it->second.targetShortcut) == CommonSharedConstants::VK_DISABLED);
+ bool isOriginalActionKeyPressed = false;
- // Set old shortcut key down state
- int i = 0;
- KeyboardManagerHelper::SetModifierKeyEvents(it->first, it->second.winKeyInvoked, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
-
- // Set old action key
- KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)it->first.GetActionKey(), 0, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
- i++;
-
- // Send current key pressed without shortcut flag so that it can be reprocessed in case the physical keys pressed are a different remapped shortcut
- KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)data->lParam->vkCode, 0, 0);
- i++;
-
- // Send dummy key
- KeyboardManagerHelper::SetDummyKeyEvent(keyEventList, i, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
-
- it->second.isShortcutInvoked = false;
- it->second.winKeyInvoked = ModifierKey::Disabled;
- // If app specific shortcut has finished invoking, reset the target application
- if (activatedApp != KeyboardManagerConstants::NoActivatedApp)
+ if (!isRemapToDisable)
{
- keyboardManagerState.SetActivatedApp(KeyboardManagerConstants::NoActivatedApp);
+ // If the remap target key is currently pressed, then we do not have to revert the keyboard state to the physical keys
+ if (ii.GetVirtualKeyState((KeyboardManagerHelper::FilterArtificialKeys(std::get(it->second.targetShortcut)))))
+ {
+ isOriginalActionKeyPressed = true;
+ }
+ }
+ else
+ {
+ isOriginalActionKeyPressed = it->second.isOriginalActionKeyPressed;
}
- UINT res = ii.SendVirtualInput((UINT)key_count, keyEventList, sizeof(INPUT));
- delete[] keyEventList;
- return 1;
+ if (isRemapToDisable || !isOriginalActionKeyPressed)
+ {
+ // Key down for original shortcut modifiers and action key, and current key press
+ size_t key_count = src_size + 1;
+
+ LPINPUT keyEventList = new INPUT[key_count]();
+ memset(keyEventList, 0, sizeof(keyEventList));
+
+ // Set original shortcut key down state
+ int i = 0;
+ KeyboardManagerHelper::SetModifierKeyEvents(it->first, it->second.winKeyInvoked, keyEventList, i, true, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
+
+ // Send the original action key only if it is physically pressed. For remappings to keys other than disabled we already check earlier that it is not pressed in this scenario. For remap to disable
+ if (isRemapToDisable && isOriginalActionKeyPressed)
+ {
+ // Set original action key
+ KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)it->first.GetActionKey(), 0, KeyboardManagerConstants::KEYBOARDMANAGER_SHORTCUT_FLAG);
+ i++;
+ }
+ else
+ {
+ key_count--;
+ }
+
+ // Send current key pressed without shortcut flag so that it can be reprocessed in case the physical keys pressed are a different remapped shortcut
+ KeyboardManagerHelper::SetKeyEvent(keyEventList, i, INPUT_KEYBOARD, (WORD)data->lParam->vkCode, 0, 0);
+ i++;
+
+ // Do not send a dummy key as we want the current key press to behave as normal i.e. it can do press+release functionality if required. Required to allow a shortcut to Win key remap invoked directly after another shortcut to key remap is released to open start menu
+
+ // Reset the remap state
+ it->second.isShortcutInvoked = false;
+ it->second.winKeyInvoked = ModifierKey::Disabled;
+ it->second.isOriginalActionKeyPressed = false;
+ // If app specific shortcut has finished invoking, reset the target application
+ if (activatedApp != KeyboardManagerConstants::NoActivatedApp)
+ {
+ keyboardManagerState.SetActivatedApp(KeyboardManagerConstants::NoActivatedApp);
+ }
+
+ UINT res = ii.SendVirtualInput((UINT)key_count, keyEventList, sizeof(INPUT));
+ delete[] keyEventList;
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
}
}
- // For remap to key, nothing should be done since the shortcut should only get released on releasing any of the original shortcut keys.
// Case 6: If any key apart from original modifier or original action key is released - This can't happen since the key down would have to happen first, which is handled above. If a key up message is generated for some other key (maybe by code) do not suppress it
}
}
diff --git a/src/modules/keyboardmanager/dll/Resources.resx b/src/modules/keyboardmanager/dll/Resources.resx
index a226598fa0..af410acd59 100644
--- a/src/modules/keyboardmanager/dll/Resources.resx
+++ b/src/modules/keyboardmanager/dll/Resources.resx
@@ -178,13 +178,13 @@
Select the key you want to change (Key) and then the key or shortcut you want it to become (Mapped To).
- For example, if you want to press A and get ""Ctrl+C"", key ""A"" would be your ""Key"" column and the shortcut ""Ctrl+C"" would be your ""Mapped To"" column.
+ For example, if you want to press A and get "Ctrl+C", key "A" would be your "Key" column and the shortcut "Ctrl+C" would be your "Mapped To" column.
Select the shortcut you want to change (Shortcut) and then the key or shortcut you want it to invoke (Mapped To).
- For example, if you want to press ""Ctrl+C"" and get ""Alt"" only on Microsoft Edge, ""Ctrl+C"" would be your ""Shortcut"" column, the key ""Alt"" would be your ""Mapped To"" column, and ""MSEdge"" would be your ""Target App"" column. If no target app is entered, it will apply globally. The name must be the process name and not the app name.
+ For example, if you want to press "Ctrl+C" and get "Alt" only on Microsoft Edge, "Ctrl+C" would be your "Shortcut" column, the key "Alt" would be your "Mapped To" column, and "MSEdge" would be your "Target App" column. If no target app is entered, it will apply globally. The name must be the process name and not the app name.
Type
@@ -265,7 +265,7 @@
Unexpected error
- Key Drop Down
+ Key
Add Key Remap
diff --git a/src/modules/keyboardmanager/dll/dllmain.cpp b/src/modules/keyboardmanager/dll/dllmain.cpp
index 554f5ff3cd..b7937ecddf 100644
--- a/src/modules/keyboardmanager/dll/dllmain.cpp
+++ b/src/modules/keyboardmanager/dll/dllmain.cpp
@@ -45,6 +45,9 @@ private:
// The PowerToy name that will be shown in the settings.
const std::wstring app_name = GET_RESOURCE_STRING(IDS_KEYBOARDMANAGER);
+ //contains the non localized key of the powertoy
+ std::wstring app_key = KeyboardManagerConstants::ModuleName;
+
// Low level hook handles
static HHOOK hook_handle;
@@ -77,7 +80,7 @@ public:
try
{
PowerToysSettings::PowerToyValues settings =
- PowerToysSettings::PowerToyValues::load_from_settings_file(get_name());
+ PowerToysSettings::PowerToyValues::load_from_settings_file(get_key());
auto current_config = settings.get_string_value(KeyboardManagerConstants::ActiveConfigurationSettingName);
if (current_config)
@@ -227,12 +230,18 @@ public:
delete this;
}
- // Return the display name of the powertoy, this will be cached by the runner
+ // Return the localized display name of the powertoy
virtual const wchar_t* get_name() override
{
return app_name.c_str();
}
+ // Return the non localized key of the powertoy, this will be cached by the runner
+ virtual const wchar_t* get_key() override
+ {
+ return app_key.c_str();
+ }
+
// Return JSON with the configuration options.
virtual bool get_config(wchar_t* buffer, int* buffer_size) override
{
@@ -286,7 +295,7 @@ public:
{
// Parse the input JSON string.
PowerToysSettings::PowerToyValues values =
- PowerToysSettings::PowerToyValues::from_json_string(config);
+ PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
// If you don't need to do any custom processing of the settings, proceed
// to persists the values calling:
diff --git a/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl
index d67e2e27c1..bf66d520df 100644
--- a/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/cs/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
+
+
@@ -174,10 +177,13 @@
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl
index fa00800342..a100aaf674 100644
--- a/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/de/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl
index a462da484b..515bf7aec4 100644
--- a/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/es/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl
index a4919280fe..38d4eb9237 100644
--- a/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/fr/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
+
+
@@ -174,10 +177,13 @@
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 3d8b0042b4..385612b4c8 100644
--- a/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/hu/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl
index bebf3856c5..db12d4f8fb 100644
--- a/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/it/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 8e63090d16..ce3553b373 100644
--- a/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/ja/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 7292739578..68ffe7f7c0 100644
--- a/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/ko/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl
index adfb47f061..b51d16390d 100644
--- a/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/nl/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl
index a9c2712ac1..e1074b8166 100644
--- a/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/pl/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 88091d18c5..fd493716c2 100644
--- a/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/pt-BR/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 2b4f7a703f..d3a528b156 100644
--- a/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/pt-PT/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
+
+
@@ -174,10 +177,13 @@
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl
index edcec90002..8e10833418 100644
--- a/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/ru/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 797e9b2c96..f3ce0a1fdd 100644
--- a/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/sv/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 7f7387118f..7e9d18aad4 100644
--- a/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/tr/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl
index 8d88b55487..830346b63b 100644
--- a/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/zh-Hans/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
+
+
@@ -174,10 +177,13 @@
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl b/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl
index cb208596f2..4ea9189d1c 100644
--- a/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl
+++ b/src/modules/keyboardmanager/dll/loc/zh-Hant/src/modules/keyboardmanager/dll/Resources.resx.lcl
@@ -102,10 +102,13 @@
-
-
-
+
+
@@ -174,10 +177,13 @@
-
-
-
+
+
@@ -390,10 +396,13 @@
-
-
-
+
+
diff --git a/src/modules/keyboardmanager/test/BufferValidationTests.cpp b/src/modules/keyboardmanager/test/BufferValidationTests.cpp
index 161cf8f8bb..05e841c1d5 100644
--- a/src/modules/keyboardmanager/test/BufferValidationTests.cpp
+++ b/src/modules/keyboardmanager/test/BufferValidationTests.cpp
@@ -22,7 +22,7 @@ namespace RemappingUITests
{
int elementRowIndex;
int elementColIndex;
- int selectedIndexFromDropDown;
+ int selectedCodeFromDropDown;
};
struct ValidateShortcutBufferElementArgs
@@ -30,7 +30,7 @@ namespace RemappingUITests
int elementRowIndex;
int elementColIndex;
uint32_t indexOfDropDownLastModified;
- std::vector selectedIndicesOnDropDowns;
+ std::vector selectedCodesOnDropDowns;
std::wstring targetAppNameInTextBox;
bool isHybridColumn;
RemapBufferRow bufferRow;
@@ -60,7 +60,7 @@ namespace RemappingUITests
// Validate and update the element when -1 i.e. null selection is made on an empty row.
ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, -1 };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is validated and buffer is updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::NoError);
@@ -79,9 +79,8 @@ namespace RemappingUITests
remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, NULL }), std::wstring()));
// Validate and update the element when selecting B on an empty row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, GetDropDownIndexFromDropDownList(0x42, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, 0x42 };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is validated and buffer is updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::NoError);
@@ -98,9 +97,8 @@ namespace RemappingUITests
remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, 0x41 }), std::wstring()));
// Validate and update the element when selecting B on a row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, GetDropDownIndexFromDropDownList(0x42, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, 0x42 };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is validated and buffer is updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::NoError);
@@ -114,17 +112,16 @@ namespace RemappingUITests
RemapBuffer remapBuffer;
// Add a row with Ctrl+A as the target
- remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, Shortcut(std::vector{ VK_CONTROL, 0x41 }) }), std::wstring()));
+ remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, Shortcut(std::vector{ VK_CONTROL, 0x41 }) }), std::wstring()));
// Validate and update the element when selecting B on a row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, GetDropDownIndexFromDropDownList(0x42, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, 0x42 };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is validated and buffer is updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::NoError);
Assert::AreEqual((DWORD)0x42, std::get(remapBuffer[0].first[0]));
- Assert::AreEqual(true, Shortcut(std::vector{ VK_CONTROL, 0x41 }) == std::get(remapBuffer[0].first[1]));
+ Assert::AreEqual(true, Shortcut(std::vector{ VK_CONTROL, 0x41 }) == std::get(remapBuffer[0].first[1]));
}
// Test if the ValidateAndUpdateKeyBufferElement method is unsuccessful when setting first column to the same value as the right column
@@ -136,9 +133,8 @@ namespace RemappingUITests
remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, 0x41 }), std::wstring()));
// Validate and update the element when selecting A on a row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, GetDropDownIndexFromDropDownList(0x41, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 0, 0, 0x41 };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is invalid and buffer is not updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::MapToSameKey);
@@ -156,9 +152,8 @@ namespace RemappingUITests
remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, 0x43 }), std::wstring()));
// Validate and update the element when selecting A on second row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, GetDropDownIndexFromDropDownList(0x41, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, 0x41 };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is invalid and buffer is not updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::SameKeyPreviouslyMapped);
@@ -173,17 +168,16 @@ namespace RemappingUITests
// Add a row from A->B and a row with Ctrl+A as target
remapBuffer.push_back(std::make_pair(RemapBufferItem({ 0x41, 0x42 }), std::wstring()));
- remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, Shortcut(std::vector{ VK_CONTROL, 0x41 }) }), std::wstring()));
+ remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, Shortcut(std::vector{ VK_CONTROL, 0x41 }) }), std::wstring()));
// Validate and update the element when selecting A on second row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, GetDropDownIndexFromDropDownList(0x41, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, 0x41 };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is invalid and buffer is not updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::SameKeyPreviouslyMapped);
Assert::AreEqual((DWORD)NULL, std::get(remapBuffer[1].first[0]));
- Assert::AreEqual(true, Shortcut(std::vector{ VK_CONTROL, 0x41 }) == std::get(remapBuffer[1].first[1]));
+ Assert::AreEqual(true, Shortcut(std::vector{ VK_CONTROL, 0x41 }) == std::get(remapBuffer[1].first[1]));
}
// Test if the ValidateAndUpdateKeyBufferElement method is unsuccessful when setting first column of a key to key row to a conflicting modifier with another row
@@ -196,9 +190,8 @@ namespace RemappingUITests
remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, 0x43 }), std::wstring()));
// Validate and update the element when selecting LCtrl on second row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, GetDropDownIndexFromDropDownList(VK_LCONTROL, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, VK_LCONTROL };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is invalid and buffer is not updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::ConflictingModifierKey);
@@ -213,24 +206,21 @@ namespace RemappingUITests
// Add a row from Ctrl->B and a row with Ctrl+A as target
remapBuffer.push_back(std::make_pair(RemapBufferItem({ VK_CONTROL, 0x42 }), std::wstring()));
- remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, Shortcut(std::vector{ VK_CONTROL, 0x41 }) }), std::wstring()));
+ remapBuffer.push_back(std::make_pair(RemapBufferItem({ NULL, Shortcut(std::vector{ VK_CONTROL, 0x41 }) }), std::wstring()));
// Validate and update the element when selecting LCtrl on second row
- std::vector keyList = keyboardLayout.GetKeyCodeList(false);
- ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, GetDropDownIndexFromDropDownList(VK_LCONTROL, keyList) };
- KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedIndexFromDropDown, keyboardLayout.GetKeyCodeList(false), remapBuffer);
+ ValidateAndUpdateKeyBufferElementArgs args = { 1, 0, VK_LCONTROL };
+ KeyboardManagerHelper::ErrorType error = BufferValidationHelpers::ValidateAndUpdateKeyBufferElement(args.elementRowIndex, args.elementColIndex, args.selectedCodeFromDropDown, remapBuffer);
// Assert that the element is invalid and buffer is not updated
Assert::AreEqual(true, error == KeyboardManagerHelper::ErrorType::ConflictingModifierKey);
Assert::AreEqual((DWORD)NULL, std::get(remapBuffer[1].first[0]));
- Assert::AreEqual(true, Shortcut(std::vector{ VK_CONTROL, 0x41 }) == std::get(remapBuffer[1].first[1]));
+ Assert::AreEqual(true, Shortcut(std::vector{ VK_CONTROL, 0x41 }) == std::get(remapBuffer[1].first[1]));
}
// Test if the ValidateShortcutBufferElement method is successful and no drop down action is required on setting a column to null in a new or valid row
TEST_METHOD (ValidateShortcutBufferElement_ShouldReturnNoErrorAndNoAction_OnSettingColumnToNullInANewOrValidRow)
{
- std::vector keyList = keyboardLayout.GetKeyCodeList(true);
-
std::vector testCases;
// Case 1: Validate the element when making null-selection (-1 index) on first column of empty shortcut to shortcut row
testCases.push_back({ 0, 0, 0, std::vector{ -1 }, std::wstring(), false, std::make_pair(RemapBufferItem{ Shortcut(), Shortcut() }, std::wstring()) });
@@ -241,43 +231,43 @@ namespace RemappingUITests
// Case 4: Validate the element when making null-selection (-1 index) on second column of empty shortcut to key row
testCases.push_back({ 0, 1, 0, std::vector{ -1 }, std::wstring(), true, std::make_pair(RemapBufferItem{ Shortcut(), NULL }, std::wstring()) });
// Case 5: Validate the element when making null-selection (-1 index) on first dropdown of first column of valid shortcut to shortcut row
- testCases.push_back({ 0, 0, 0, std::vector({ -1, GetDropDownIndexFromDropDownList(0x43, keyList) }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
+ testCases.push_back({ 0, 0, 0, std::vector({ -1, 0x43 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
// Case 6: Validate the element when making null-selection (-1 index) on first dropdown of second column of valid shortcut to shortcut row
- testCases.push_back({ 0, 1, 0, std::vector({ -1, GetDropDownIndexFromDropDownList(0x41, keyList) }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 0, std::vector({ -1, 0x41 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
// Case 7: Validate the element when making null-selection (-1 index) on first dropdown of second column of valid hybrid shortcut to shortcut row
- testCases.push_back({ 0, 1, 0, std::vector({ -1, GetDropDownIndexFromDropDownList(0x41, keyList) }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 0, std::vector({ -1, 0x41 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
// Case 8: Validate the element when making null-selection (-1 index) on second dropdown of first column of valid shortcut to shortcut row
- testCases.push_back({ 0, 0, 1, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
+ testCases.push_back({ 0, 0, 1, std::vector({ VK_CONTROL, -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
// Case 9: Validate the element when making null-selection (-1 index) on second dropdown of second column of valid shortcut to shortcut row
- testCases.push_back({ 0, 1, 1, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 1, std::vector({ VK_CONTROL, -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
// Case 10: Validate the element when making null-selection (-1 index) on second dropdown of second column of valid hybrid shortcut to shortcut row
- testCases.push_back({ 0, 1, 1, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), -1 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 1, std::vector({ VK_CONTROL, -1 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, 0x43 }, std::vector{ VK_CONTROL, 0x41 } }, std::wstring()) });
// Case 11: Validate the element when making null-selection (-1 index) on first dropdown of first column of valid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 0, 0, std::vector({ -1, GetDropDownIndexFromDropDownList(VK_SHIFT, keyList), GetDropDownIndexFromDropDownList(0x44, keyList) }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 0, 0, std::vector({ -1, VK_SHIFT, 0x44 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 12: Validate the element when making null-selection (-1 index) on first dropdown of second column of valid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 1, 0, std::vector({ -1, GetDropDownIndexFromDropDownList(VK_SHIFT, keyList), GetDropDownIndexFromDropDownList(0x42, keyList) }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 0, std::vector({ -1, VK_SHIFT, 0x42 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 13: Validate the element when making null-selection (-1 index) on first dropdown of second column of valid hybrid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 1, 0, std::vector({ -1, GetDropDownIndexFromDropDownList(VK_SHIFT, keyList), GetDropDownIndexFromDropDownList(0x42, keyList) }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 0, std::vector({ -1, VK_SHIFT, 0x42 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 14: Validate the element when making null-selection (-1 index) on second dropdown of first column of valid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 0, 1, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), -1, GetDropDownIndexFromDropDownList(0x44, keyList) }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 0, 1, std::vector({ VK_CONTROL, -1, 0x44 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 15: Validate the element when making null-selection (-1 index) on second dropdown of second column of valid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 1, 1, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), -1, GetDropDownIndexFromDropDownList(0x42, keyList) }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 1, std::vector({ VK_CONTROL, -1, 0x42 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 16: Validate the element when making null-selection (-1 index) on second dropdown of second column of valid hybrid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 1, 1, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), -1, GetDropDownIndexFromDropDownList(0x42, keyList) }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 1, std::vector({ VK_CONTROL, -1, 0x42 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 17: Validate the element when making null-selection (-1 index) on third dropdown of first column of valid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 0, 2, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), GetDropDownIndexFromDropDownList(VK_SHIFT, keyList), -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 0, 2, std::vector({ VK_CONTROL, VK_SHIFT, -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 18: Validate the element when making null-selection (-1 index) on third dropdown of second column of valid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 1, 2, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), GetDropDownIndexFromDropDownList(VK_SHIFT, keyList), -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 2, std::vector({ VK_CONTROL, VK_SHIFT, -1 }), std::wstring(), false, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
// Case 19: Validate the element when making null-selection (-1 index) on third dropdown of second column of valid hybrid 3 key shortcut to shortcut row
- testCases.push_back({ 0, 1, 2, std::vector({ GetDropDownIndexFromDropDownList(VK_CONTROL, keyList), GetDropDownIndexFromDropDownList(VK_SHIFT, keyList), -1 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
+ testCases.push_back({ 0, 1, 2, std::vector({ VK_CONTROL, VK_SHIFT, -1 }), std::wstring(), true, std::make_pair(RemapBufferItem{ std::vector{ VK_CONTROL, VK_SHIFT, 0x44 }, std::vector{ VK_CONTROL, VK_SHIFT, 0x42 } }, std::wstring()) });
- RunTestCases(testCases, [this, &keyList](const ValidateShortcutBufferElementArgs& testCase) {
+ RunTestCases(testCases, [this](const ValidateShortcutBufferElementArgs& testCase) {
// Arrange
RemapBuffer remapBuffer;
remapBuffer.push_back(testCase.bufferRow);
// Act
- std::pair result = BufferValidationHelpers::ValidateShortcutBufferElement(testCase.elementRowIndex, testCase.elementColIndex, testCase.indexOfDropDownLastModified, testCase.selectedIndicesOnDropDowns, testCase.targetAppNameInTextBox, testCase.isHybridColumn, keyList, remapBuffer, true);
+ std::pair