From 617b7adb09adf8171b2b127066840ab08b23be07 Mon Sep 17 00:00:00 2001 From: Enrico Giordani Date: Mon, 10 May 2021 01:39:54 -0700 Subject: [PATCH 01/11] [KBM] Fix for handle leak (#11182) --- .../KeyboardManagerEngineLibrary/KeyboardManager.cpp | 4 ++-- .../KeyboardManagerEngineLibrary/KeyboardManager.h | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.cpp b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.cpp index 953ba23afe..83369f2e32 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.cpp +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.cpp @@ -50,6 +50,7 @@ KeyboardManager::KeyboardManager() loadingSettings = false; }; + editorIsRunningEvent = CreateEvent(nullptr, true, false, KeyboardManagerConstants::EditorWindowEventName.c_str()); settingsEventWaiter = EventWaiter(KeyboardManagerConstants::SettingsEventName, changeSettingsCallback); } @@ -126,8 +127,7 @@ intptr_t KeyboardManager::HandleKeyboardHookEvent(LowlevelKeyboardEvent* data) n } // Suspend remapping if remap key/shortcut window is opened - auto h = CreateEvent(nullptr, true, false, KeyboardManagerConstants::EditorWindowEventName.c_str()); - if (h != nullptr && WaitForSingleObject(h, 0) == WAIT_OBJECT_0) + if (editorIsRunningEvent != nullptr && WaitForSingleObject(editorIsRunningEvent, 0) == WAIT_OBJECT_0) { return 0; } diff --git a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.h b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.h index af30fae587..457a9135b7 100644 --- a/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.h +++ b/src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.h @@ -9,7 +9,15 @@ class KeyboardManager public: // Constructor KeyboardManager(); - + + ~KeyboardManager() + { + if (editorIsRunningEvent) + { + CloseHandle(editorIsRunningEvent); + } + } + void StartLowlevelKeyboardHook(); void StopLowlevelKeyboardHook(); @@ -38,6 +46,8 @@ private: std::atomic_bool loadingSettings = false; + HANDLE editorIsRunningEvent = nullptr; + // Hook procedure definition static LRESULT CALLBACK HookProc(int nCode, WPARAM wParam, LPARAM lParam); From c33bc31c8992a32b8cd6d6f463ac3c21c22491a7 Mon Sep 17 00:00:00 2001 From: csigs Date: Mon, 10 May 2021 05:58:21 -0700 Subject: [PATCH 02/11] LEGO: check in for master to temporary branch. (#11187) --- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../editor/FancyZonesEditor/Properties/Resources.resx.lcl | 6 +++--- .../Strings/en-us/Resources.resw.lcl | 6 +++--- 18 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 87867d4234..9c6da1684d 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 598ee6bd70..71a5f7da78 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 172c8a3ba5..9d1a4d8c7c 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 6120550dc1..702ac7dc02 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 1f03af8d9e..7e6f6de7c6 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 383194462e..b15e0073f6 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index b3bbf33ced..0618ece3f8 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 40c19891b4..9c4d3fd8b3 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index a907194c20..96df9f423e 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index b7596753d9..0abfd13dcf 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 426135d863..22f52a0f72 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 350d773d18..67bdb71ebb 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index f94bb138f7..48e8a95088 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index b047900382..e1d7aeb273 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index bee55bc13d..418d112824 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index 83aa9b3d4a..0c5a0c7be8 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl index afc2271014..4c886a68f5 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl +++ b/src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl @@ -246,12 +246,12 @@ - + - + - + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl index 9f71675e3f..c057a5a319 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl @@ -1821,12 +1821,12 @@ - + - + - + From 1fa174c184dff43c2d97b6c6cd9400237f0effff Mon Sep 17 00:00:00 2001 From: Enrico Giordani Date: Mon, 10 May 2021 08:48:41 -0700 Subject: [PATCH 03/11] [Run] remove Python class (#11186) Run deosn't support Python plugins --- src/modules/launcher/JsonRPC/wox.py | 115 ---------------------------- 1 file changed, 115 deletions(-) delete mode 100644 src/modules/launcher/JsonRPC/wox.py diff --git a/src/modules/launcher/JsonRPC/wox.py b/src/modules/launcher/JsonRPC/wox.py deleted file mode 100644 index 2e65a629d6..0000000000 --- a/src/modules/launcher/JsonRPC/wox.py +++ /dev/null @@ -1,115 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import print_function -import json -import sys -import inspect - -class Wox(object): - """ - Wox python plugin base - """ - - def __init__(self): - rpc_request = json.loads(sys.argv[1]) - # proxy is not working now - self.proxy = rpc_request.get("proxy",{}) - request_method_name = rpc_request.get("method") - request_parameters = rpc_request.get("parameters") - methods = inspect.getmembers(self, predicate=inspect.ismethod) - - request_method = dict(methods)[request_method_name] - results = request_method(*request_parameters) - - if request_method_name == "query" or request_method_name == "context_menu": - print(json.dumps({"result": results})) - - def query(self,query): - """ - sub class need to override this method - """ - return [] - - def context_menu(self, data): - """ - optional context menu entries for a result - """ - return [] - - def debug(self,msg): - """ - alert msg - """ - print("DEBUG:{}".format(msg)) - sys.exit() - -class WoxAPI(object): - - @classmethod - def change_query(cls,query,requery = False): - """ - change wox query - """ - print(json.dumps({"method": "Wox.ChangeQuery","parameters":[query,requery]})) - - @classmethod - def shell_run(cls,cmd): - """ - run shell commands - """ - print(json.dumps({"method": "Wox.ShellRun","parameters":[cmd]})) - - @classmethod - def close_app(cls): - """ - close wox - """ - print(json.dumps({"method": "Wox.CloseApp","parameters":[]})) - - @classmethod - def hide_app(cls): - """ - hide wox - """ - print(json.dumps({"method": "Wox.HideApp","parameters":[]})) - - @classmethod - def show_app(cls): - """ - show wox - """ - print(json.dumps({"method": "Wox.ShowApp","parameters":[]})) - - @classmethod - def show_msg(cls,title,sub_title,ico_path=""): - """ - show messagebox - """ - print(json.dumps({"method": "Wox.ShowMsg","parameters":[title,sub_title,ico_path]})) - - @classmethod - def open_setting_dialog(cls): - """ - open setting dialog - """ - print(json.dumps({"method": "Wox.OpenSettingDialog","parameters":[]})) - - @classmethod - def start_loadingbar(cls): - """ - start loading animation in wox - """ - print(json.dumps({"method": "Wox.StartLoadingBar","parameters":[]})) - - @classmethod - def stop_loadingbar(cls): - """ - stop loading animation in wox - """ - print(json.dumps({"method": "Wox.StopLoadingBar","parameters":[]})) - - @classmethod - def reload_plugins(cls): - """ - reload all wox plugins - """ - print(json.dumps({"method": "Wox.ReloadPlugins","parameters":[]})) From 863b2541a0e89e997aecc22334779ed5c9f5ab05 Mon Sep 17 00:00:00 2001 From: Enrico Giordani Date: Mon, 10 May 2021 08:58:58 -0700 Subject: [PATCH 04/11] [build] stop building PowerRenameUWPUI (#11185) this project was needed when PowerToys supported the MSIX installer --- PowerToys.sln | 2 -- 1 file changed, 2 deletions(-) diff --git a/PowerToys.sln b/PowerToys.sln index 79abcae51e..a8eb6ef7ae 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -383,9 +383,7 @@ Global {64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.ActiveCfg = Release|x64 {64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.Build.0 = Release|x64 {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x64.ActiveCfg = Debug|x64 - {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x64.Build.0 = Debug|x64 {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.ActiveCfg = Release|x64 - {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.Build.0 = Release|x64 {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.ActiveCfg = Debug|x64 {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.Build.0 = Debug|x64 {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Release|x64.ActiveCfg = Release|x64 From eb106650f630cf7bc69112103ad17c857d17bc8e Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Tue, 11 May 2021 03:39:14 -0400 Subject: [PATCH 05/11] Upgrade check-spelling to v0.0.18 (#11114) * spelling: sent Signed-off-by: Josh Soref * Upgrade check-spelling to v0.0.18 Signed-off-by: Josh Soref Co-authored-by: Josh Soref --- .github/actions/spell-check/advice.md | 27 ++++++++++++++ .github/actions/spell-check/excludes.txt | 15 +++++++- .github/actions/spell-check/expect.txt | 37 ++++++++++++++----- .github/workflows/spelling.yml | 6 +-- .../SndModuleSettings`1.cs | 2 +- 5 files changed, 72 insertions(+), 15 deletions(-) create mode 100644 .github/actions/spell-check/advice.md diff --git a/.github/actions/spell-check/advice.md b/.github/actions/spell-check/advice.md new file mode 100644 index 0000000000..2a32b65207 --- /dev/null +++ b/.github/actions/spell-check/advice.md @@ -0,0 +1,27 @@ + +
If you see a bunch of garbage + +If it relates to a ... +
well-formed pattern + +See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it. + +If not, try writing one and adding it to the `patterns.txt` file. + +Patterns are Perl 5 Regular Expressions - you can [test]( +https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines. + +Note that patterns can't match multiline strings. +
+
binary-ish string + +Please add a file path to the `excludes.txt` file instead of just accepting the garbage. + +File paths are Perl 5 Regular Expressions - you can [test]( +https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files. + +`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md]( +../tree/HEAD/README.md) (on whichever branch you're using). +
+ +
diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt index f67ef73b90..2320d2b36e 100644 --- a/.github/actions/spell-check/excludes.txt +++ b/.github/actions/spell-check/excludes.txt @@ -21,9 +21,22 @@ ignore$ \.min\. \.mod$ \.pdf$ -\.png$ \.PNG$ +\.png$ \.woff$ \.zip$ +^src/common/logger/logger\.vcxproj\.filters$ +^src/common/notifications/BackgroundActivatorDLL/BackgroundActivator\.vcxproj\.filters$ +^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$ +^src/modules/colorPicker/ColorPickerUI/Resources/colorPicker\.cur$ +^src/modules/fancyzones/lib/FancyZonesWinHookEventIDs\.h$ +^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$ +^src/modules/imageresizer/dll/ImageResizerExt\.rgs$ +^src/modules/powerrename/testapp/PowerRenameTest\.vcxproj\.filters$ +^src/modules/powerrename/UWPui/pch\.h$ +^src/modules/powerrename/UWPui/PowerRenameUWPUI\.vcxproj\.filters$ +^src/modules/previewpane/PreviewPaneUnitTests/HelperFiles/MarkdownWithHTMLImageTag\.txt$ +^tools/CleanUp_tool/CleanUp_tool\.vcxproj\.filters$ ^\.github/ ^\.github/actions/spell-check/ +^\.gitmodules$ diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 5b24af3dee..128a9c69e7 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -1,7 +1,9 @@ +aaaa aac abcd abcdef abcdefgh +ABCDEFGHIJKLMNOPQRSTUVWXYZ abgr ABlocked Abug @@ -19,6 +21,7 @@ Actioncenter actioned activatable ACTIVATEAPP +activationaction Addavirtualdesktop addrum ADDUNDORECORD @@ -112,6 +115,7 @@ aumid AUTHN AUTOAPPEND autocomplete +autogenerated autogenerates AUTOHIDE AUTOMATIONPROPERTIES @@ -201,6 +205,8 @@ cdpxwin CENTERALIGN cfg cguid +changecursor +Changemove charconv charset chdir @@ -212,7 +218,7 @@ CHILDWINDOW chrdavis Chris's chrono -chrzan +Chrzan CHT CImage cinttypes @@ -254,6 +260,8 @@ codereview Codespaces COINIT colorconv +colorhistory +colorhistorylimit colorpicker COLORREF colorscheme @@ -287,6 +295,7 @@ CONTROLL CONTROLPARENT Controlz coords +copiedcolorrepresentation cortana cotaskmem COULDNOT @@ -339,6 +348,7 @@ CUI currentculture CURSORINFO cursorpos +customaction CUSTOMACTIONTEST cvd cwchar @@ -438,7 +448,6 @@ DLIMAGES dll dllexport dllhost -dllimport dllmain DNLEN doctype @@ -822,6 +831,7 @@ IImage Iindex IInitialize IInspectable +IIO IItem IJson IKs @@ -830,6 +840,7 @@ ILogon IMAGEHLP imageresizer IMAGERESIZEREXT +imageresizersettings IMain IMarkdown ime @@ -969,6 +980,7 @@ jpeg jpg JPN json +JSONOf jsonval JSX junja @@ -1116,7 +1128,7 @@ LVS LVSIL LWA lwin -LZW +lzw mailto MAINICON Mainwindow @@ -1259,7 +1271,7 @@ NCMBUTTONDOWN NCMBUTTONUP NCMOUSELEAVE NCMOUSEMOVE -NCol +ncol NCPAINT NCRBUTTONDBLCLK NCRBUTTONDOWN @@ -1272,6 +1284,7 @@ NESW netcore netcoreapp netframework +NETFX netsh netstandard Neue @@ -1338,6 +1351,7 @@ npm npos NResize ntdll +NTFS NTSTATUS nuget nullopt @@ -1366,7 +1380,6 @@ oldnewthing oldpath oldtheme oleaut -OleAut OLECHAR OLEDB OLIVEGREEN @@ -1392,6 +1405,7 @@ OUTOFCONTEXT OUTOFMEMORY Outptr outro +outsettings OVERLAPPEDWINDOW overlaywindow OWNDC @@ -1632,7 +1646,6 @@ rexit rfind rgb RGBQUAD -rge rgelt Rgn rgs @@ -1671,6 +1684,7 @@ runtimeclass runtimeconfig runtimes rv +RUS rvalue rvm rwin @@ -1752,6 +1766,7 @@ SHORTCUTSTARTWITHMODIFIER Shortcuttool shortdate SHORTPATH +showcolorname SHOWDEFAULT SHOWELEVATIONPROMPT SHOWMAXIMIZED @@ -1786,7 +1801,7 @@ SLGP sln SMALLICON SMTO -Snd +snd somil SORTDOWN SOURCECLIENTAREAONLY @@ -1882,6 +1897,7 @@ svgpreviewhandler Switchbetweenvirtualdesktops SWP swprintf +SWRESTORE SYMED SYMOPT SYNCPAINT @@ -1956,6 +1972,7 @@ TNP todo toggleswitch toolbar +Toolchain toolset tooltip toolwindow @@ -2084,11 +2101,13 @@ VIDEOINFOHEADER viewbox viewmodel virtualization +visiblecolorformats Visibletrue visualbrush visualstudio vk VKey +VKTAB vm vmax vmin @@ -2125,6 +2144,7 @@ wcsncmp wcsnicmp wdp wdupenv +We'd weakme webcam webclient @@ -2219,7 +2239,6 @@ wsz wtoi WTS WTSAT -wu Wwan www wxs @@ -2228,6 +2247,7 @@ xamarin xaml XAttribute xbf +XBind XBUTTON XBUTTONDBLCLK XBUTTONDOWN @@ -2269,7 +2289,6 @@ zh ZIndex zipfolder zm -zom zonable ZONECOLOR ZONEHIGHLIGHTCOLOR diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index e1a4335cbb..1b008e2366 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -2,6 +2,7 @@ name: Spell checking on: pull_request_target: push: + issue_comment: jobs: build: @@ -13,12 +14,9 @@ jobs: uses: actions/checkout@v2.0.0 with: ref: refs/pull/${{github.event.pull_request.number}}/merge - fetch-depth: 5 - name: checkout if: "!contains(github.event_name, 'pull_request')" uses: actions/checkout@v2.0.0 - with: - fetch-depth: 5 - - uses: check-spelling/check-spelling@0.0.17-alpha + - uses: check-spelling/check-spelling@v0.0.18 with: config: .github/actions/spell-check diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs index 463ec535ad..f8069791f3 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs @@ -7,7 +7,7 @@ using System.Text.Json.Serialization; namespace Microsoft.PowerToys.Settings.UI.Library { - // Represents a powertoys module settings setnt to the runner. + // Represents a powertoys module settings sent to the runner. public class SndModuleSettings { [JsonPropertyName("powertoys")] From f1b4081257f77b0f18428d9dbae2317c867cf7f4 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 11 May 2021 12:52:05 -0700 Subject: [PATCH 06/11] Create akaLinks.md --- doc/devdocs/akaLinks.md | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 doc/devdocs/akaLinks.md diff --git a/doc/devdocs/akaLinks.md b/doc/devdocs/akaLinks.md new file mode 100644 index 0000000000..cd0edbf92e --- /dev/null +++ b/doc/devdocs/akaLinks.md @@ -0,0 +1,44 @@ +# Full list of aka links + +| ShortUrl | TargetUrl | +|----------|----------| +| installpowertoys | https://github.com/microsoft/PowerToys/releases/latest | +| powertoys | https://github.com/microsoft/PowerToys | +| PowerToysAppCompat | https://github.com/microsoft/PowerToys/wiki/Application-Compatibility | +| powerToysCannotRemapKeys | https://docs.microsoft.com/windows/powertoys/keyboard-manager#keys-that-cannot-be-remapped | +| powerToysColorPickerImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/ColorPicker_small.png | +| powerToysColorPickerSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/ColorPicker_large.png | +| powertoysDetectedElevatedHelp | https://docs.microsoft.com/windows/powertoys/administrator | +| powertoys-docs | https://docs.microsoft.com/windows/powertoys/?WT.mc_id=twitter-0000-docsmsft | +| powerToysFancyZoneImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/FancyZones_small.png | +| powerToysFancyZoneSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/FancyZones_large.png | +| powerToysGiveFeedback | https://github.com/microsoft/PowerToys/issues | +| powerToysImageResizerImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/ImageResizer_small.png | +| powerToysImageResizerSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/ImageResizer_large.png | +| powerToysKBMImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/KBM_small.png | +| powerToysKBMSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/KBM_large.png | +| PowerToysOverview | https://docs.microsoft.com/windows/powertoys/ | +| PowerToysOverview_ColorPicker | https://docs.microsoft.com/windows/powertoys/color-picker | +| PowerToysOverview_FancyZones | https://docs.microsoft.com/windows/powertoys/fancyzones | +| PowerToysOverview_FileExplorerAddOns | https://docs.microsoft.com/windows/powertoys/file-explorer | +| PowerToysOverview_ImageResizer | https://docs.microsoft.com/windows/powertoys/image-resizer | +| PowerToysOverview_KeyboardManager | https://docs.microsoft.com/windows/powertoys/keyboard-manager | +| PowerToysOverview_PowerRename | https://docs.microsoft.com/windows/powertoys/powerrename | +| PowerToysOverview_PowerToysRun | https://docs.microsoft.com/windows/powertoys/run | +| PowerToysOverview_ShortcutGuide | https://docs.microsoft.com/windows/powertoys/shortcut-guide | +| PowerToysOverview_VideoConference | https://docs.microsoft.com/windows/powertoys/video-conference-mute | +| powerToysPowerLauncherImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PowerLauncher_small.png | +| powerToysPowerLauncherSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PowerLauncher_large.png | +| powerToysPowerPreviewImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PowerPreview_small.png | +| powerToysPowerPreviewSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PowerPreview_large.png | +| powerToysPowerRenameImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PowerRename_small.png | +| powerToysPowerRenameSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PowerRename_large.png | +| powerToysPTImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PT_small.png | +| powerToysPTSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PT_large.png | +| powerToysReportBug | https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=Issue-Bug%2CTriage-Needed&template=bug_report.yml&title= | +| powerToysRequestFeature | https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=feature_request.md&title= | +| powerToysShortcutGuideImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/ShortcutGuide_small.png | +| powerToysShortcutGuideSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/ShortcutGuide_large.png | +| powerToysVideoConferenceImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/VideoConference_small.png | +| powerToysVideoConferenceSettingImage | https://github.com/microsoft/PowerToys/wiki/images/overview/VideoConference_large.png | +| powertoyswiki | https://github.com/microsoft/PowerToys/wiki | From e7ecad6c141cbd2f0707abe3354c5b9281ca6791 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 11 May 2021 16:28:33 -0700 Subject: [PATCH 07/11] Update COMMUNITY.md --- COMMUNITY.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/COMMUNITY.md b/COMMUNITY.md index 5f87a576e0..05bbdd2e10 100644 --- a/COMMUNITY.md +++ b/COMMUNITY.md @@ -9,6 +9,9 @@ Names are in alphabetical order based on first name. ### [@davidegiacometti](https://github.com/davidegiacometti) - [Davide Giacometti](https://www.linkedin.com/in/davidegiacometti/) Davide has helped fix multiple bugs, added new features, as well as help us with the ARM64 effort by porting applications to .NET Core. +## [@jsoref](https://github.com/jsoref) - Josh Soref +Helping keep our spelling correct :) + ### [@Niels9001](https://github.com/niels9001/) - [Niels Laute](https://nielslaute.com/) Niels has helped drive large sums of our update toward a new [consistent and modern UX](https://github.com/microsoft/PowerToys/issues/891). This includes the [launcher work](https://github.com/microsoft/PowerToys/issues/44), color picker UX update and [icon design](https://github.com/microsoft/PowerToys/issues/1118). @@ -18,7 +21,13 @@ Niels has helped drive large sums of our update toward a new [consistent and mod Rafael has helped do the [upgrade from CppWinRT 1.x to 2.0](https://github.com/microsoft/PowerToys/issues/1907). He directly provided feedback to the CppWinRT team for bugs from this migration as well. ### [@royvou](https://github.com/royvou) -Roy has helped out contributing a features to PowerToys Run +Roy has helped out contributing multiple features to PowerToys Run + +### [@TobiasSekan](https://github.com/TobiasSekan) - Tobias Sekan +Tobias Sekan has helped out contributing features to PowerToys Run such as Settings plugin, Registry plugin + +### [@ThiefZero](https://github.com/ThiefZero) +ThiefZero has helped out contributing a features to PowerToys Run such as the unit converter plugin ## Open source projects @@ -52,6 +61,10 @@ Image Resizer is from Brice. PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Explorer +### [@dend](https://github.com/dend/) - Den Delimarsky + +PowerToys Espresso is a tool to keep your computer awake + ### [@martinchrzan](https://github.com/martinchrzan/) - Martin Chrzan Color Picker is from Martin. From 10c6172a2945969ac0b771e80985b1f44d019883 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 11 May 2021 16:32:36 -0700 Subject: [PATCH 08/11] Update COMMUNITY.md --- COMMUNITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COMMUNITY.md b/COMMUNITY.md index 05bbdd2e10..0e6566232b 100644 --- a/COMMUNITY.md +++ b/COMMUNITY.md @@ -9,7 +9,7 @@ Names are in alphabetical order based on first name. ### [@davidegiacometti](https://github.com/davidegiacometti) - [Davide Giacometti](https://www.linkedin.com/in/davidegiacometti/) Davide has helped fix multiple bugs, added new features, as well as help us with the ARM64 effort by porting applications to .NET Core. -## [@jsoref](https://github.com/jsoref) - Josh Soref +### [@jsoref](https://github.com/jsoref) - Josh Soref Helping keep our spelling correct :) ### [@Niels9001](https://github.com/niels9001/) - [Niels Laute](https://nielslaute.com/) From 2e7ca62291f787b8bdbf6fa78f4b1dcf0861fbc4 Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Tue, 11 May 2021 16:46:33 -0700 Subject: [PATCH 09/11] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0819bccbda..38e108c763 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline #### Stable version -Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.37.0-x64.exe` to download the PowerToys installer. +Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.37.2-x64.exe` to download the PowerToys installer. This is our preferred method. From e1942b8058212a4955b137751b9e7b9dab31e6b3 Mon Sep 17 00:00:00 2001 From: Enrico Giordani Date: Wed, 12 May 2021 07:23:23 -0700 Subject: [PATCH 10/11] [spell checker] add terms (#11224) * [spell checker] add terms * [spell checker] more terms --- .github/actions/spell-check/expect.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index 128a9c69e7..80feb8280a 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -341,6 +341,7 @@ CTest ctime CTLCOLORSTATIC ctor +CTriage CTRLALTDEL Ctrls Ctx @@ -403,7 +404,9 @@ DEFPUSHBUTTON deinitialization DELA deletethis +Delimarsky delims +dend DENORMAL depersist deprioritized @@ -450,6 +453,7 @@ dllexport dllhost dllmain DNLEN +docsmsft doctype DONTVALIDATEPATH dotnet @@ -882,6 +886,7 @@ INSTALLLOCATION INSTALLLOGATTRIBUTES INSTALLLOGMODE INSTALLMESSAGE +installpowertoys INSTALLPROPERTY INSTALLSTARTMENUSHORTCUT INSTALLSTATE @@ -982,6 +987,7 @@ JPN json JSONOf jsonval +jsoref JSX junja jxr @@ -1487,6 +1493,7 @@ powershell powertoy powertoysinterop powertoyssetup +powertoyswiki Powrprof ppenum ppidl @@ -1803,6 +1810,7 @@ SMALLICON SMTO snd somil +Soref SORTDOWN SOURCECLIENTAREAONLY SOURCEHEADER From daa775c2158a564af31245dea7fc28c33bd322f8 Mon Sep 17 00:00:00 2001 From: Mahi Taher Date: Thu, 13 May 2021 00:58:26 +0800 Subject: [PATCH 11/11] Fix ColourPicker HowToUse Text in Resources.resw (#11212) Fixes #11199 --- .../Strings/en-us/Resources.resw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw index 177f03d7f8..7482ca83ec 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw @@ -1045,7 +1045,7 @@ Take a moment to preview the various utilities listed or view our comprehensive release notes - {Win} + {Ctrl} + {C} to open Color Picker. + {Win} + {Shift} + {C} to open Color Picker. To select a color with more precision, {scroll the mouse wheel} to zoom in.