diff --git a/PowerToys.sln b/PowerToys.sln index ef7077f4f0..655bb99c67 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -139,6 +139,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowWalker", "src\modules {74485049-C722-400F-ABE5-86AC52D929B3} = {74485049-C722-400F-ABE5-86AC52D929B3} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManager", "src\modules\keyboardmanager\dll\KeyboardManager.vcxproj", "{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}" +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}" @@ -149,7 +151,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageResizerUITest", "src\m EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerKeys", "src\modules\PowerKeys\PowerKeys.vcxproj", "{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerKeysUI", "src\modules\keyboardmanager\ui\PowerKeysUI.vcxproj", "{EAF23649-EF6E-478B-980E-81FAD96CCA2A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerUI", "src\modules\keyboardmanager\ui\KeyboardManagerUI.vcxproj", "{EAF23649-EF6E-478B-980E-81FAD96CCA2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "action_runner", "src\action_runner\action_runner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}" ProjectSection(ProjectDependencies) = postProject @@ -209,213 +211,102 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Setting EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Debug|ARM.ActiveCfg = Debug|x64 {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Debug|x64.ActiveCfg = Debug|x64 {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Debug|x64.Build.0 = Debug|x64 - {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Debug|x86.ActiveCfg = Debug|x64 - {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Release|ARM.ActiveCfg = Release|x64 {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Release|x64.ActiveCfg = Release|x64 {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Release|x64.Build.0 = Release|x64 - {9412D5C6-2CF2-4FC2-A601-B55508EA9B27}.Release|x86.ActiveCfg = Release|x64 - {74485049-C722-400F-ABE5-86AC52D929B3}.Debug|ARM.ActiveCfg = Debug|x64 {74485049-C722-400F-ABE5-86AC52D929B3}.Debug|x64.ActiveCfg = Debug|x64 {74485049-C722-400F-ABE5-86AC52D929B3}.Debug|x64.Build.0 = Debug|x64 - {74485049-C722-400F-ABE5-86AC52D929B3}.Debug|x86.ActiveCfg = Debug|x64 - {74485049-C722-400F-ABE5-86AC52D929B3}.Release|ARM.ActiveCfg = Release|x64 {74485049-C722-400F-ABE5-86AC52D929B3}.Release|x64.ActiveCfg = Release|x64 {74485049-C722-400F-ABE5-86AC52D929B3}.Release|x64.Build.0 = Release|x64 - {74485049-C722-400F-ABE5-86AC52D929B3}.Release|x86.ActiveCfg = Release|x64 - {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Debug|ARM.ActiveCfg = Debug|x64 {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Debug|x64.ActiveCfg = Debug|x64 {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Debug|x64.Build.0 = Debug|x64 - {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Debug|x86.ActiveCfg = Debug|x64 - {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Release|ARM.ActiveCfg = Release|x64 {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Release|x64.ActiveCfg = Release|x64 {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Release|x64.Build.0 = Release|x64 - {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA}.Release|x86.ActiveCfg = Release|x64 - {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Debug|ARM.ActiveCfg = Debug|x64 {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Debug|x64.ActiveCfg = Debug|x64 {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Debug|x64.Build.0 = Debug|x64 - {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Debug|x86.ActiveCfg = Debug|x64 - {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Release|ARM.ActiveCfg = Release|x64 {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Release|x64.ActiveCfg = Release|x64 {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Release|x64.Build.0 = Release|x64 - {44CC9375-3E6E-4D99-8913-7FB748807EBD}.Release|x86.ActiveCfg = Release|x64 - {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Debug|ARM.ActiveCfg = Debug|x64 {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Debug|x64.ActiveCfg = Debug|x64 {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Debug|x64.Build.0 = Debug|x64 - {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Debug|x86.ActiveCfg = Debug|x64 - {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Release|ARM.ActiveCfg = Release|x64 {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Release|x64.ActiveCfg = Release|x64 {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Release|x64.Build.0 = Release|x64 - {07C389E3-6BC8-41CF-923E-307B1265FA2D}.Release|x86.ActiveCfg = Release|x64 - {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Debug|ARM.ActiveCfg = Debug|x64 {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Debug|x64.ActiveCfg = Debug|x64 {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Debug|x64.Build.0 = Debug|x64 - {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Debug|x86.ActiveCfg = Debug|x64 - {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Release|ARM.ActiveCfg = Release|x64 {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Release|x64.ActiveCfg = Release|x64 {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Release|x64.Build.0 = Release|x64 - {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}.Release|x86.ActiveCfg = Release|x64 - {48804216-2A0E-4168-A6D8-9CD068D14227}.Debug|ARM.ActiveCfg = Debug|x64 {48804216-2A0E-4168-A6D8-9CD068D14227}.Debug|x64.ActiveCfg = Debug|x64 {48804216-2A0E-4168-A6D8-9CD068D14227}.Debug|x64.Build.0 = Debug|x64 - {48804216-2A0E-4168-A6D8-9CD068D14227}.Debug|x86.ActiveCfg = Debug|x64 - {48804216-2A0E-4168-A6D8-9CD068D14227}.Release|ARM.ActiveCfg = Release|x64 {48804216-2A0E-4168-A6D8-9CD068D14227}.Release|x64.ActiveCfg = Release|x64 {48804216-2A0E-4168-A6D8-9CD068D14227}.Release|x64.Build.0 = Release|x64 - {48804216-2A0E-4168-A6D8-9CD068D14227}.Release|x86.ActiveCfg = Release|x64 - {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Debug|ARM.ActiveCfg = Debug|x64 {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Debug|x64.ActiveCfg = Debug|x64 {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Debug|x64.Build.0 = Debug|x64 - {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Debug|x86.ActiveCfg = Debug|x64 - {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Release|ARM.ActiveCfg = Release|x64 {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Release|x64.ActiveCfg = Release|x64 {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Release|x64.Build.0 = Release|x64 - {9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9}.Release|x86.ActiveCfg = Release|x64 - {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Debug|ARM.ActiveCfg = Debug|x64 {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Debug|x64.ActiveCfg = Debug|x64 {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Debug|x64.Build.0 = Debug|x64 - {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Debug|x86.ActiveCfg = Debug|x64 - {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|ARM.ActiveCfg = Release|x64 {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|x64.ActiveCfg = Release|x64 {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|x64.Build.0 = Release|x64 - {1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|x86.ActiveCfg = Release|x64 - {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|ARM.ActiveCfg = Debug|x64 {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|x64.ActiveCfg = Debug|x64 {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|x64.Build.0 = Debug|x64 - {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|x86.ActiveCfg = Debug|x64 - {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Release|ARM.ActiveCfg = Release|x64 {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Release|x64.ActiveCfg = Release|x64 {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Release|x64.Build.0 = Release|x64 - {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Release|x86.ActiveCfg = Release|x64 - {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Debug|ARM.ActiveCfg = Debug|Win32 {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Debug|x64.ActiveCfg = Debug|x64 {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Debug|x64.Build.0 = Debug|x64 - {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Debug|x86.ActiveCfg = Debug|Win32 - {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Debug|x86.Build.0 = Debug|Win32 - {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Release|ARM.ActiveCfg = Release|Win32 {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Release|x64.ActiveCfg = Release|x64 {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Release|x64.Build.0 = Release|x64 - {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Release|x86.ActiveCfg = Release|Win32 - {B25AC7A5-FB9F-4789-B392-D5C85E948670}.Release|x86.Build.0 = Release|Win32 - {51920F1F-C28C-4ADF-8660-4238766796C2}.Debug|ARM.ActiveCfg = Debug|Win32 {51920F1F-C28C-4ADF-8660-4238766796C2}.Debug|x64.ActiveCfg = Debug|x64 {51920F1F-C28C-4ADF-8660-4238766796C2}.Debug|x64.Build.0 = Debug|x64 - {51920F1F-C28C-4ADF-8660-4238766796C2}.Debug|x86.ActiveCfg = Debug|Win32 - {51920F1F-C28C-4ADF-8660-4238766796C2}.Debug|x86.Build.0 = Debug|Win32 - {51920F1F-C28C-4ADF-8660-4238766796C2}.Release|ARM.ActiveCfg = Release|Win32 {51920F1F-C28C-4ADF-8660-4238766796C2}.Release|x64.ActiveCfg = Release|x64 {51920F1F-C28C-4ADF-8660-4238766796C2}.Release|x64.Build.0 = Release|x64 - {51920F1F-C28C-4ADF-8660-4238766796C2}.Release|x86.ActiveCfg = Release|Win32 - {51920F1F-C28C-4ADF-8660-4238766796C2}.Release|x86.Build.0 = Release|Win32 - {0E072714-D127-460B-AFAD-B4C40B412798}.Debug|ARM.ActiveCfg = Debug|x64 {0E072714-D127-460B-AFAD-B4C40B412798}.Debug|x64.ActiveCfg = Debug|x64 {0E072714-D127-460B-AFAD-B4C40B412798}.Debug|x64.Build.0 = Debug|x64 - {0E072714-D127-460B-AFAD-B4C40B412798}.Debug|x86.ActiveCfg = Debug|x64 - {0E072714-D127-460B-AFAD-B4C40B412798}.Release|ARM.ActiveCfg = Release|x64 {0E072714-D127-460B-AFAD-B4C40B412798}.Release|x64.ActiveCfg = Release|x64 {0E072714-D127-460B-AFAD-B4C40B412798}.Release|x64.Build.0 = Release|x64 - {0E072714-D127-460B-AFAD-B4C40B412798}.Release|x86.ActiveCfg = Release|x64 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Debug|ARM.ActiveCfg = Debug|Win32 {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Debug|x64.ActiveCfg = Debug|x64 {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Debug|x64.Build.0 = Debug|x64 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Debug|x86.ActiveCfg = Debug|Win32 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Debug|x86.Build.0 = Debug|Win32 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Release|ARM.ActiveCfg = Release|Win32 {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Release|x64.ActiveCfg = Release|x64 {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Release|x64.Build.0 = Release|x64 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Release|x86.ActiveCfg = Release|Win32 - {A3935CF4-46C5-4A88-84D3-6B12E16E6BA2}.Release|x86.Build.0 = Release|Win32 - {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Debug|ARM.ActiveCfg = Debug|Win32 {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Debug|x64.ActiveCfg = Debug|x64 {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Debug|x64.Build.0 = Debug|x64 - {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Debug|x86.ActiveCfg = Debug|Win32 - {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Debug|x86.Build.0 = Debug|Win32 - {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Release|ARM.ActiveCfg = Release|Win32 {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Release|x64.ActiveCfg = Release|x64 {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Release|x64.Build.0 = Release|x64 - {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Release|x86.ActiveCfg = Release|Win32 - {2151F984-E006-4A9F-92EF-C6DDE3DC8413}.Release|x86.Build.0 = Release|Win32 - {64A80062-4D8B-4229-8A38-DFA1D7497749}.Debug|ARM.ActiveCfg = Debug|x64 {64A80062-4D8B-4229-8A38-DFA1D7497749}.Debug|x64.ActiveCfg = Debug|x64 {64A80062-4D8B-4229-8A38-DFA1D7497749}.Debug|x64.Build.0 = Debug|x64 - {64A80062-4D8B-4229-8A38-DFA1D7497749}.Debug|x86.ActiveCfg = Debug|x64 - {64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|ARM.ActiveCfg = Release|x64 {64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.ActiveCfg = Release|x64 {64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.Build.0 = Release|x64 - {64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x86.ActiveCfg = Release|x64 - {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|ARM.ActiveCfg = Debug|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}.Debug|x86.ActiveCfg = Debug|x64 - {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|ARM.ActiveCfg = Release|x64 {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.ActiveCfg = Release|x64 {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.Build.0 = Release|x64 - {0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x86.ActiveCfg = Release|x64 - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Debug|ARM.ActiveCfg = Debug|ARM - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Debug|ARM.Build.0 = Debug|ARM {0B593A6C-4143-4337-860E-DB5710FB87DB}.Debug|x64.ActiveCfg = Debug|x64 {0B593A6C-4143-4337-860E-DB5710FB87DB}.Debug|x64.Build.0 = Debug|x64 - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Debug|x86.ActiveCfg = Debug|Win32 - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Debug|x86.Build.0 = Debug|Win32 - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Release|ARM.ActiveCfg = Release|ARM - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Release|ARM.Build.0 = Release|ARM {0B593A6C-4143-4337-860E-DB5710FB87DB}.Release|x64.ActiveCfg = Release|x64 {0B593A6C-4143-4337-860E-DB5710FB87DB}.Release|x64.Build.0 = Release|x64 - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Release|x86.ActiveCfg = Release|Win32 - {0B593A6C-4143-4337-860E-DB5710FB87DB}.Release|x86.Build.0 = Release|Win32 - {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Debug|ARM.ActiveCfg = Debug|Win32 {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Debug|x64.ActiveCfg = Debug|x64 {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Debug|x64.Build.0 = Debug|x64 - {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Debug|x86.ActiveCfg = Debug|Win32 - {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Debug|x86.Build.0 = Debug|Win32 - {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Release|ARM.ActiveCfg = Release|Win32 {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Release|x64.ActiveCfg = Release|x64 {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Release|x64.Build.0 = Release|x64 - {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Release|x86.ActiveCfg = Release|Win32 - {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}.Release|x86.Build.0 = Release|Win32 - {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Debug|ARM.ActiveCfg = Debug|x64 {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Debug|x64.ActiveCfg = Debug|x64 {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Debug|x64.Build.0 = Debug|x64 - {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Debug|x86.ActiveCfg = Debug|x64 - {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Release|ARM.ActiveCfg = Release|x64 {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Release|x64.ActiveCfg = Release|x64 {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Release|x64.Build.0 = Release|x64 - {B9BDF8BE-FED7-49B5-A7AE-DD4D1CA2D9EB}.Release|x86.ActiveCfg = Release|x64 - {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Debug|ARM.ActiveCfg = Debug|x64 {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Debug|x64.ActiveCfg = Debug|x64 {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Debug|x64.Build.0 = Debug|x64 - {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Debug|x86.ActiveCfg = Debug|x64 - {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Release|ARM.ActiveCfg = Release|x64 {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Release|x64.ActiveCfg = Release|x64 {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Release|x64.Build.0 = Release|x64 - {51D3BD1F-07A8-48EB-B2A0-0A249CD4E1A6}.Release|x86.ActiveCfg = Release|x64 - {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|ARM.ActiveCfg = Debug|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}.Debug|x86.ActiveCfg = Debug|x64 - {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Release|ARM.ActiveCfg = Release|x64 {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Release|x64.ActiveCfg = Release|x64 {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Release|x64.Build.0 = Release|x64 - {89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Release|x86.ActiveCfg = Release|x64 - {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Debug|ARM.ActiveCfg = Debug|x64 {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Debug|x64.ActiveCfg = Debug|x64 {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Debug|x64.Build.0 = Debug|x64 - {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Debug|x86.ActiveCfg = Debug|x64 - {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Release|ARM.ActiveCfg = Release|x64 {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Release|x64.ActiveCfg = Release|x64 {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Release|x64.Build.0 = Release|x64 - {EAF23649-EF6E-478B-980E-81FAD96CCA2A}.Release|x86.ActiveCfg = Release|x64 - {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Debug|ARM.ActiveCfg = Debug|Win32 {2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}.Debug|x64.ActiveCfg = Debug|x64 {2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}.Debug|x64.Build.0 = Debug|x64 {2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}.Release|x64.ActiveCfg = Release|x64 @@ -430,31 +321,16 @@ Global {E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}.Release|x64.Build.0 = Release|x64 {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Debug|x64.ActiveCfg = Debug|x64 {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Debug|x64.Build.0 = Debug|x64 - {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Debug|x86.ActiveCfg = Debug|Win32 - {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Debug|x86.Build.0 = Debug|Win32 - {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Release|ARM.ActiveCfg = Release|Win32 {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Release|x64.ActiveCfg = Release|x64 {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Release|x64.Build.0 = Release|x64 - {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Release|x86.ActiveCfg = Release|Win32 - {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}.Release|x86.Build.0 = Release|Win32 - {17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|ARM.ActiveCfg = Debug|Win32 {17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x64.ActiveCfg = Debug|x64 {17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x64.Build.0 = Debug|x64 - {17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x86.ActiveCfg = Debug|Win32 - {17DA04DF-E393-4397-9CF0-84DABE11032E}.Debug|x86.Build.0 = Debug|Win32 - {17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|ARM.ActiveCfg = Release|Win32 {17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x64.ActiveCfg = Release|x64 {17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x64.Build.0 = Release|x64 - {17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x86.ActiveCfg = Release|Win32 - {17DA04DF-E393-4397-9CF0-84DABE11032E}.Release|x86.Build.0 = Release|Win32 - {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Debug|ARM.ActiveCfg = Debug|x64 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Debug|x64.ActiveCfg = Debug|x64 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Debug|x64.Build.0 = Debug|x64 - {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Debug|x86.ActiveCfg = Debug|x64 - {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Release|ARM.ActiveCfg = Release|x64 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Release|x64.ActiveCfg = Release|x64 {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Release|x64.Build.0 = Release|x64 - {8AFFA899-0B73-49EC-8C50-0FADDA57B2FC}.Release|x86.ActiveCfg = Release|x64 {880ED251-9E16-4713-9A70-D35FE0C01669}.Debug|x64.ActiveCfg = Debug|x64 {880ED251-9E16-4713-9A70-D35FE0C01669}.Debug|x64.Build.0 = Debug|x64 {880ED251-9E16-4713-9A70-D35FE0C01669}.Release|x64.ActiveCfg = Release|x64 diff --git a/src/modules/keyboardmanager/common/KeyboardManagerState.h b/src/modules/keyboardmanager/common/KeyboardManagerState.h index 0622a7fe15..8bc91fc3f6 100644 --- a/src/modules/keyboardmanager/common/KeyboardManagerState.h +++ b/src/modules/keyboardmanager/common/KeyboardManagerState.h @@ -1,9 +1,8 @@ #pragma once -//#include "pch.h" #include "Helpers.h" #include #include - +using namespace winrt::Windows::UI::Xaml::Controls; // Enum type to store different states of the UI enum class KeyboardManagerUIState diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.rc b/src/modules/keyboardmanager/dll/KeyboardManager.rc new file mode 100644 index 0000000000..bc266ccb07 --- /dev/null +++ b/src/modules/keyboardmanager/dll/KeyboardManager.rc @@ -0,0 +1,44 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" +#include "../../../common/version.h" + +STRINGTABLE +BEGIN + IDS_SETTINGS_DESCRIPTION L"Customize your experience by remapping keys or creating new shortcuts!" + IDS_KEYBOARDMANAGER L"Keyboard Manager" +END + + +1 VERSIONINFO + FILEVERSION 0,1,0,0 + PRODUCTVERSION 0,1,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", COMPANY_NAME + VALUE "FileDescription", "Keyboard Manager PowerToy Module" + VALUE "FileVersion", FILE_VERSION_STRING + VALUE "InternalName", "Keyboard Manager PowerToy" + VALUE "LegalCopyright", COPYRIGHT_NOTE + VALUE "OriginalFilename", "KeyboardManager.dll" + VALUE "ProductName", "Keyboard Manager PowerToy" + VALUE "ProductVersion", PRODUCT_VERSION_STRING + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END \ No newline at end of file diff --git a/src/modules/keyboardmanager/dll/PowerKeys.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj similarity index 95% rename from src/modules/keyboardmanager/dll/PowerKeys.vcxproj rename to src/modules/keyboardmanager/dll/KeyboardManager.vcxproj index d9a120bac9..92128d5dab 100644 --- a/src/modules/keyboardmanager/dll/PowerKeys.vcxproj +++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj @@ -14,9 +14,9 @@ 15.0 {89f34af7-1c34-4a72-aa6e-534bcf972bd9} Win32Proj - PowerKeys + KeyboardManager 10.0 - PowerKeys + KeyboardManager @@ -125,12 +125,12 @@ {8affa899-0b73-49ec-8c50-0fadda57b2fc} - + {eaf23649-ef6e-478b-980e-81fad96cca2a} - + diff --git a/src/modules/keyboardmanager/dll/PowerKeys.rc b/src/modules/keyboardmanager/dll/PowerKeys.rc deleted file mode 100644 index 3cef7a3903..0000000000 --- a/src/modules/keyboardmanager/dll/PowerKeys.rc +++ /dev/null @@ -1,32 +0,0 @@ -1 VERSIONINFO - FILEVERSION 0,1,0,0 - PRODUCTVERSION 0,1,0,0 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "Company Name" - VALUE "FileDescription", "$projectname$ Module" - VALUE "FileVersion", "0.1.0.0" - VALUE "InternalName", "$projectname$" - VALUE "LegalCopyright", "Copyright (C) 2019 Company Name" - VALUE "OriginalFilename", "$projectname$.dll" - VALUE "ProductName", "$projectname$" - VALUE "ProductVersion", "0.1.0.0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END \ No newline at end of file diff --git a/src/modules/keyboardmanager/dll/dllmain.cpp b/src/modules/keyboardmanager/dll/dllmain.cpp index 0d47609573..b2d13b7651 100644 --- a/src/modules/keyboardmanager/dll/dllmain.cpp +++ b/src/modules/keyboardmanager/dll/dllmain.cpp @@ -4,6 +4,7 @@ #include #include #include "trace.h" +#include "resource.h" #include #include @@ -26,22 +27,20 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv return TRUE; } -// The PowerToy name that will be shown in the settings. -const static wchar_t* MODULE_NAME = L"PowerKeys"; -// Add a description that will we shown in the module settings page. -const static wchar_t* MODULE_DESC = L"Customize your experience by remapping keys or creating new shortcuts!"; - // Implement the PowerToy Module Interface and all the required methods. -class PowerKeys : public PowertoyModuleIface +class KeyboardManager : public PowertoyModuleIface { private: // The PowerToy state. bool m_enabled = false; - // Flags used for distinguishing key events sent by PowerKeys - static const ULONG_PTR POWERKEYS_INJECTED_FLAG = 0x1; - static const ULONG_PTR POWERKEYS_SINGLEKEY_FLAG = 0x11; - static const ULONG_PTR POWERKEYS_SHORTCUT_FLAG = 0x101; + // The PowerToy name that will be shown in the settings. + const std::wstring app_name = GET_RESOURCE_STRING(IDS_KEYBOARDMANAGER); + + // Flags used for distinguishing key events sent by Keyboard Manager + static const ULONG_PTR KEYBOARDMANAGER_INJECTED_FLAG = 0x1; + static const ULONG_PTR KEYBOARDMANAGER_SINGLEKEY_FLAG = 0x11; + static const ULONG_PTR KEYBOARDMANAGER_SHORTCUT_FLAG = 0x101; // Dummy key event used in between key up and down events to prevent certain global events from happening static const DWORD DUMMY_KEY = 0xFF; @@ -52,8 +51,8 @@ private: // Required for Unhook in old versions of Windows static HHOOK hook_handle_copy; - // Static pointer to the current powerkeys object required for accessing the HandleKeyboardHookEvent function in the hook procedure (Only global or static variables can be accessed in a hook procedure CALLBACK) - static PowerKeys* powerkeys_object_ptr; + // Static pointer to the current keyboardmanager object required for accessing the HandleKeyboardHookEvent function in the hook procedure (Only global or static variables can be accessed in a hook procedure CALLBACK) + static KeyboardManager* keyboardmanager_object_ptr; // Variable which stores all the state information to be shared between the UI and back-end KeyboardManagerState keyboardManagerState; @@ -63,12 +62,12 @@ private: public: // Constructor - PowerKeys() + KeyboardManager() { init_map(); // Set the static pointer to the newest object of the class - powerkeys_object_ptr = this; + keyboardmanager_object_ptr = this; }; // This function is used to add the hardcoded mappings @@ -113,7 +112,7 @@ public: // Return the display name of the powertoy, this will be cached by the runner virtual const wchar_t* get_name() override { - return MODULE_NAME; + return app_name.c_str(); } // Return array of the names of all events that this powertoy listens for, with @@ -133,7 +132,7 @@ public: // Create a Settings object. PowerToysSettings::Settings settings(hinstance, get_name()); - settings.set_description(MODULE_DESC); + settings.set_description(IDS_SETTINGS_DESCRIPTION); return settings.serialize_to_buffer(buffer, buffer_size); } @@ -218,7 +217,7 @@ public: { event.lParam = reinterpret_cast(lParam); event.wParam = wParam; - if (powerkeys_object_ptr->HandleKeyboardHookEvent(&event) == 1) + if (keyboardmanager_object_ptr->HandleKeyboardHookEvent(&event) == 1) { return 1; } @@ -312,7 +311,7 @@ public: intptr_t HandleSingleKeyRemapEvent(LowlevelKeyboardEvent* data) noexcept { // Check if the key event was generated by KeyboardManager to avoid remapping events generated by us. - if (!(data->lParam->dwExtraInfo & POWERKEYS_INJECTED_FLAG)) + if (!(data->lParam->dwExtraInfo & KEYBOARDMANAGER_INJECTED_FLAG)) { auto it = keyboardManagerState.singleKeyReMap.find(data->lParam->vkCode); if (it != keyboardManagerState.singleKeyReMap.end()) @@ -322,14 +321,14 @@ public: { return 1; } - + int key_count = 1; LPINPUT keyEventList = new INPUT[size_t(key_count)](); memset(keyEventList, 0, sizeof(keyEventList)); keyEventList[0].type = INPUT_KEYBOARD; keyEventList[0].ki.wVk = it->second; keyEventList[0].ki.dwFlags = 0; - keyEventList[0].ki.dwExtraInfo = POWERKEYS_SINGLEKEY_FLAG; + keyEventList[0].ki.dwExtraInfo = KEYBOARDMANAGER_SINGLEKEY_FLAG; if (data->wParam == WM_KEYUP || data->wParam == WM_SYSKEYUP) { keyEventList[0].ki.dwFlags = KEYEVENTF_KEYUP; @@ -348,7 +347,7 @@ public: intptr_t HandleSingleKeyToggleToModEvent(LowlevelKeyboardEvent* data) noexcept { // Check if the key event was generated by KeyboardManager to avoid remapping events generated by us. - if (!(data->lParam->dwExtraInfo & POWERKEYS_INJECTED_FLAG)) + if (!(data->lParam->dwExtraInfo & KEYBOARDMANAGER_INJECTED_FLAG)) { auto it = keyboardManagerState.singleKeyToggleToMod.find(data->lParam->vkCode); if (it != keyboardManagerState.singleKeyToggleToMod.end()) @@ -371,11 +370,11 @@ public: keyEventList[0].type = INPUT_KEYBOARD; keyEventList[0].ki.wVk = (WORD)data->lParam->vkCode; keyEventList[0].ki.dwFlags = 0; - keyEventList[0].ki.dwExtraInfo = POWERKEYS_SINGLEKEY_FLAG; + keyEventList[0].ki.dwExtraInfo = KEYBOARDMANAGER_SINGLEKEY_FLAG; keyEventList[1].type = INPUT_KEYBOARD; keyEventList[1].ki.wVk = (WORD)data->lParam->vkCode; keyEventList[1].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[1].ki.dwExtraInfo = POWERKEYS_SINGLEKEY_FLAG; + keyEventList[1].ki.dwExtraInfo = KEYBOARDMANAGER_SINGLEKEY_FLAG; UINT res = SendInput(key_count, keyEventList, sizeof(INPUT)); delete[] keyEventList; @@ -535,7 +534,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = it.second.first[j]; keyEventList[i].ki.dwFlags = 0; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j++; @@ -552,7 +551,7 @@ public: keyEventList[0].type = INPUT_KEYBOARD; keyEventList[0].ki.wVk = (WORD)DUMMY_KEY; keyEventList[0].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[0].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[0].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; // Release original shortcut state (release in reverse order of shortcut to be accurate) long long i = 1; @@ -565,7 +564,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = (WORD)it.first[j]; keyEventList[i].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j--; @@ -581,7 +580,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = it.second.first[j]; keyEventList[i].ki.dwFlags = 0; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j++; @@ -635,7 +634,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = it.second.first[j]; keyEventList[i].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j--; @@ -651,7 +650,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = (WORD)it.first[j]; keyEventList[i].ki.dwFlags = 0; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j++; @@ -676,7 +675,7 @@ public: keyEventList[0].type = INPUT_KEYBOARD; keyEventList[0].ki.wVk = it.second.first[dest_size - 1]; keyEventList[0].ki.dwFlags = 0; - keyEventList[0].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[0].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; it.second.second = true; UINT res = SendInput((UINT)key_count, keyEventList, sizeof(INPUT)); @@ -705,7 +704,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = it.second.first[j]; keyEventList[i].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j--; @@ -729,7 +728,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = it.second.first[j]; keyEventList[i].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j--; @@ -745,7 +744,7 @@ public: keyEventList[i].type = INPUT_KEYBOARD; keyEventList[i].ki.wVk = (WORD)it.first[j]; keyEventList[i].ki.dwFlags = 0; - keyEventList[i].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[i].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; i++; } j++; @@ -755,7 +754,7 @@ public: keyEventList[key_count - 1].type = INPUT_KEYBOARD; keyEventList[key_count - 1].ki.wVk = (WORD)DUMMY_KEY; keyEventList[key_count - 1].ki.dwFlags = KEYEVENTF_KEYUP; - keyEventList[key_count - 1].ki.dwExtraInfo = POWERKEYS_SHORTCUT_FLAG; + keyEventList[key_count - 1].ki.dwExtraInfo = KEYBOARDMANAGER_SHORTCUT_FLAG; } it.second.second = false; @@ -774,7 +773,7 @@ public: intptr_t HandleOSLevelShortcutRemapEvent(LowlevelKeyboardEvent* data) noexcept { // Check if the key event was generated by KeyboardManager to avoid remapping events generated by us. - if (data->lParam->dwExtraInfo != POWERKEYS_SHORTCUT_FLAG) + if (data->lParam->dwExtraInfo != KEYBOARDMANAGER_SHORTCUT_FLAG) { return HandleShortcutRemapEvent(data, keyboardManagerState.osLevelShortcutReMap); } @@ -832,7 +831,7 @@ public: intptr_t HandleAppSpecificShortcutRemapEvent(LowlevelKeyboardEvent* data) noexcept { // Check if the key event was generated by KeyboardManager to avoid remapping events generated by us. - if (data->lParam->dwExtraInfo != POWERKEYS_SHORTCUT_FLAG) + if (data->lParam->dwExtraInfo != KEYBOARDMANAGER_SHORTCUT_FLAG) { std::wstring process_name = GetCurrentApplication(false); if (process_name.empty()) @@ -851,11 +850,11 @@ public: } }; -HHOOK PowerKeys::hook_handle = nullptr; -HHOOK PowerKeys::hook_handle_copy = nullptr; -PowerKeys* PowerKeys::powerkeys_object_ptr = nullptr; +HHOOK KeyboardManager::hook_handle = nullptr; +HHOOK KeyboardManager::hook_handle_copy = nullptr; +KeyboardManager* KeyboardManager::keyboardmanager_object_ptr = nullptr; extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() { - return new PowerKeys(); + return new KeyboardManager(); } \ No newline at end of file diff --git a/src/modules/keyboardmanager/dll/resource.h b/src/modules/keyboardmanager/dll/resource.h index e69de29bb2..6fc1962b38 100644 --- a/src/modules/keyboardmanager/dll/resource.h +++ b/src/modules/keyboardmanager/dll/resource.h @@ -0,0 +1,2 @@ +#define IDS_SETTINGS_DESCRIPTION 101 +#define IDS_KEYBOARDMANAGER 102 diff --git a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp index cefa2c49de..9eb9a4daff 100644 --- a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp +++ b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp @@ -35,7 +35,7 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan // Window Creation HWND _hWndEditKeyboardWindow = CreateWindow( szWindowClass, - L"PowerKeys Remap Keyboard", + L"Remap Keyboard", WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp index 5324ccd028..21d41974d9 100644 --- a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp +++ b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp @@ -36,7 +36,7 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa // Window Creation HWND _hWndEditShortcutsWindow = CreateWindow( szWindowClass, - L"PowerKeys Edit Shortcuts", + L"Edit Shortcuts", WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/src/modules/keyboardmanager/ui/PowerKeysUI.vcxproj b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj similarity index 97% rename from src/modules/keyboardmanager/ui/PowerKeysUI.vcxproj rename to src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj index ff1373382a..07dbb7e59f 100644 --- a/src/modules/keyboardmanager/ui/PowerKeysUI.vcxproj +++ b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj @@ -15,10 +15,10 @@ 15.0 {EAF23649-EF6E-478B-980E-81FAD96CCA2A} Win32Proj - PowerKeysUI + KeyboardManagerUI 10.0.18362.0 true - PowerKeysUI + KeyboardManagerUI diff --git a/src/modules/keyboardmanager/ui/PowerKeysUI.vcxproj.filters b/src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj.filters similarity index 100% rename from src/modules/keyboardmanager/ui/PowerKeysUI.vcxproj.filters rename to src/modules/keyboardmanager/ui/KeyboardManagerUI.vcxproj.filters diff --git a/src/modules/keyboardmanager/ui/MainWindow.cpp b/src/modules/keyboardmanager/ui/MainWindow.cpp index 034890b782..cc5885a111 100644 --- a/src/modules/keyboardmanager/ui/MainWindow.cpp +++ b/src/modules/keyboardmanager/ui/MainWindow.cpp @@ -38,7 +38,7 @@ void createMainWindow(HINSTANCE hInstance, KeyboardManagerState& keyboardManager // Window Creation _hWndMain = CreateWindow( szWindowClass, - L"PowerKeys Settings", + L"Keyboard Manager Settings", WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, diff --git a/src/runner/main.cpp b/src/runner/main.cpp index 471d97a62d..5552096d5a 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -204,7 +204,7 @@ int runner(bool isProcessElevated) L"ImageResizerExt.dll", L"powerpreview.dll", L"WindowWalker.dll", - L"PowerKeys.dll" + L"KeyboardManager.dll" }; for (auto& file : std::filesystem::directory_iterator(L"modules/")) {