Skip to content

Shortcut Guide V2 #40834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 126 commits into
base: main
Choose a base branch
from
Open

Shortcut Guide V2 #40834

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
03587ae
[WIP] Shortcut Guide V2
noraa-junker Oct 14, 2024
7a6189b
Changed style a little bit
noraa-junker Oct 14, 2024
c81a423
Push
noraa-junker Nov 2, 2024
d5f5500
Push
noraa-junker Nov 3, 2024
22dc870
Code cleanup
noraa-junker Nov 3, 2024
a14c458
Fix display on monitor with mouse and move all NaticeMethods to Nativ…
noraa-junker Nov 3, 2024
da7b789
Fix error messages and read application titles out of index manifest
noraa-junker Nov 10, 2024
6952deb
Rename YmlInterpreter to ManifestInterpreter
noraa-junker Nov 10, 2024
a292a92
Merge main
noraa-junker Jun 6, 2025
b16b457
push
noraa-junker Jun 6, 2025
7ce5182
Add support for multiple shortcuts
noraa-junker Jun 7, 2025
569f072
Add copying keyboard manifests and other improvements
noraa-junker Jun 11, 2025
54d176c
Add keyboard accelerator to the search box
noraa-junker Jun 11, 2025
0b823ea
Handle errors displaying app and close window automatically on focus …
noraa-junker Jun 11, 2025
7596e96
Add taskbar indicators
noraa-junker Jun 13, 2025
46df486
Refactoring and localisation
noraa-junker Jun 15, 2025
da77396
Remove some hosts references and fix close button
noraa-junker Jun 15, 2025
a6b7614
Refactoring
noraa-junker Jun 18, 2025
d73ab4f
Remove old Shortcut Guide
noraa-junker Jul 27, 2025
07760e4
Remove legacy shortcut behaviour
noraa-junker Jul 27, 2025
1580279
Fix closing by shortcut add closing by ESC and fix missing files from…
noraa-junker Jul 27, 2025
ba40989
Merge main in
noraa-junker Jul 27, 2025
3e75fb0
Merge main in
noraa-junker Jul 27, 2025
95e0a20
Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…
noraa-junker Jul 27, 2025
e26bf2a
Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…
noraa-junker Jul 27, 2025
be799dd
Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…
noraa-junker Jul 27, 2025
038cd23
Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…
noraa-junker Jul 27, 2025
eed6dc6
Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…
noraa-junker Jul 27, 2025
3a8431a
Only display powertoys shortcuts if the modules are enabled
noraa-junker Jul 27, 2025
82b0ca7
Fix pinning and unpinning shortcuts
noraa-junker Jul 27, 2025
3475c92
Delete weird file
noraa-junker Jul 27, 2025
fe3d481
Fix spelling
noraa-junker Jul 27, 2025
201a27d
Add taskbar launch shortcuts and make powertoys shortcuts empty by de…
noraa-junker Jul 27, 2025
7e2fc44
Add taskbar launch shortcuts and make powertoys shortcuts empty by de…
noraa-junker Jul 27, 2025
fa54b49
Make settings button work and add settings placeholder
noraa-junker Jul 27, 2025
e3b1ec3
commit
noraa-junker Jul 27, 2025
7e50caa
Add disclaimers
noraa-junker Jul 27, 2025
a306797
Make UI better
noraa-junker Jul 27, 2025
2ee02c4
Fix spelling
noraa-junker Jul 27, 2025
b12fcf6
Localization
noraa-junker Jul 27, 2025
e0e7bf4
Respect theme selection
noraa-junker Jul 27, 2025
0f85f8b
Respect excluded apps
noraa-junker Jul 27, 2025
f9183af
Add welcome screen and update settings and OOBE
noraa-junker Jul 28, 2025
71dd8fe
Add attribution in settings
noraa-junker Jul 28, 2025
56f056e
Add explorer shortcuts, fix animation stopping and add an error when …
noraa-junker Jul 28, 2025
2f89281
Refactoring, commenting and fixing some little lefrover bugs
noraa-junker Jul 28, 2025
1982f26
Add documentation and only export in tasklist_positions what needs to…
noraa-junker Jul 29, 2025
0e2f466
Fix building in release mode and some other stuff
noraa-junker Jul 29, 2025
498c8d5
Fix xaml styling
noraa-junker Jul 29, 2025
273b50c
Fix arm64 configuration
noraa-junker Jul 29, 2025
7e7bb04
So something was not right. Hopefully this fixes it.
noraa-junker Jul 30, 2025
3b77feb
Merge branch 'main' into feature/shortcutguidev2
noraa-junker Jul 30, 2025
3c1a6a5
That is a kinda embarrasing error
noraa-junker Jul 30, 2025
1da76e5
Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…
noraa-junker Jul 30, 2025
2d12932
Remove failing test
noraa-junker Jul 30, 2025
3796fdb
Forgot notice.md and CPPProject has some trouble buildinng release x64
noraa-junker Jul 30, 2025
0b6683e
Make some adjustants to how the windows key is displayed
noraa-junker Aug 1, 2025
77a5bc2
Adress some PR comments and fix some bugs
noraa-junker Aug 1, 2025
7266745
Fix xaml styling
noraa-junker Aug 1, 2025
e116265
Factor out TaskbarIndicator
noraa-junker Aug 3, 2025
a41be80
Fix styling
noraa-junker Aug 3, 2025
6bd5c4c
Change some StaticResources to ThemeResources and change style of tas…
noraa-junker Aug 3, 2025
271e0c0
Change oobe design
noraa-junker Aug 4, 2025
0abae1d
close infotip when link is clicked and remove unneccesairy grid
noraa-junker Aug 4, 2025
d568d16
git messed up
noraa-junker Aug 4, 2025
f42b392
fix xaml styling
noraa-junker Aug 5, 2025
8e7be16
Change display name of File Explorer, hide taskbar indicators on othe…
noraa-junker Aug 7, 2025
69c6475
[WIP] Shortcut Guide V2
noraa-junker Oct 14, 2024
55b3e15
Changed style a little bit
noraa-junker Oct 14, 2024
6558260
Push
noraa-junker Nov 2, 2024
2f4766d
Push
noraa-junker Nov 3, 2024
ddd090c
Code cleanup
noraa-junker Nov 3, 2024
acf510d
Fix display on monitor with mouse and move all NaticeMethods to Nativ…
noraa-junker Nov 3, 2024
440e751
Fix error messages and read application titles out of index manifest
noraa-junker Nov 10, 2024
2b16068
Rename YmlInterpreter to ManifestInterpreter
noraa-junker Nov 10, 2024
6b8a3e6
push
noraa-junker Jun 6, 2025
44d12c6
Add support for multiple shortcuts
noraa-junker Jun 7, 2025
9ecf82d
Add copying keyboard manifests and other improvements
noraa-junker Jun 11, 2025
0a07811
Add keyboard accelerator to the search box
noraa-junker Jun 11, 2025
7acab45
Handle errors displaying app and close window automatically on focus …
noraa-junker Jun 11, 2025
e6edca9
Add taskbar indicators
noraa-junker Jun 13, 2025
3302e61
Refactoring and localisation
noraa-junker Jun 15, 2025
afc27e8
Remove some hosts references and fix close button
noraa-junker Jun 15, 2025
48d8e33
Refactoring
noraa-junker Jun 18, 2025
7dc8c10
Remove old Shortcut Guide
noraa-junker Jul 27, 2025
411f4df
Remove legacy shortcut behaviour
noraa-junker Jul 27, 2025
eff58e1
Fix closing by shortcut add closing by ESC and fix missing files from…
noraa-junker Jul 27, 2025
bff3874
Only display powertoys shortcuts if the modules are enabled
noraa-junker Jul 27, 2025
639b29e
Fix pinning and unpinning shortcuts
noraa-junker Jul 27, 2025
26f7610
Delete weird file
noraa-junker Jul 27, 2025
509ad63
Fix spelling
noraa-junker Jul 27, 2025
0d5c85a
Add taskbar launch shortcuts and make powertoys shortcuts empty by de…
noraa-junker Jul 27, 2025
16c4a56
Make settings button work and add settings placeholder
noraa-junker Jul 27, 2025
e70ca56
Add taskbar launch shortcuts and make powertoys shortcuts empty by de…
noraa-junker Jul 27, 2025
68a10d0
Add disclaimers
noraa-junker Jul 27, 2025
68b7b41
Make UI better
noraa-junker Jul 27, 2025
b1d5233
Fix spelling
noraa-junker Jul 27, 2025
f8cc513
Localization
noraa-junker Jul 27, 2025
2e6f80f
Respect theme selection
noraa-junker Jul 27, 2025
3458d01
Respect excluded apps
noraa-junker Jul 27, 2025
84ab120
Add welcome screen and update settings and OOBE
noraa-junker Jul 28, 2025
145247c
Add attribution in settings
noraa-junker Jul 28, 2025
97cba61
Add explorer shortcuts, fix animation stopping and add an error when …
noraa-junker Jul 28, 2025
84d4cbb
Refactoring, commenting and fixing some little lefrover bugs
noraa-junker Jul 28, 2025
4cb9c53
Add documentation and only export in tasklist_positions what needs to…
noraa-junker Jul 29, 2025
6d7d5f9
Fix building in release mode and some other stuff
noraa-junker Jul 29, 2025
5c11c75
Fix xaml styling
noraa-junker Jul 29, 2025
b553add
Fix arm64 configuration
noraa-junker Jul 29, 2025
387b7e9
So something was not right. Hopefully this fixes it.
noraa-junker Jul 30, 2025
3b7df37
That is a kinda embarrasing error
noraa-junker Jul 30, 2025
ac789a7
Remove failing test
noraa-junker Jul 30, 2025
cd844e3
Forgot notice.md and CPPProject has some trouble buildinng release x64
noraa-junker Jul 30, 2025
dc0877e
Make some adjustants to how the windows key is displayed
noraa-junker Aug 1, 2025
bb16ae1
Adress some PR comments and fix some bugs
noraa-junker Aug 1, 2025
19f9506
Fix xaml styling
noraa-junker Aug 1, 2025
72be095
Factor out TaskbarIndicator
noraa-junker Aug 3, 2025
dceb1d7
Fix styling
noraa-junker Aug 3, 2025
4853bd0
Change some StaticResources to ThemeResources and change style of tas…
noraa-junker Aug 3, 2025
a764bf3
Change oobe design
noraa-junker Aug 4, 2025
0917a64
close infotip when link is clicked and remove unneccesairy grid
noraa-junker Aug 4, 2025
73f718c
git messed up
noraa-junker Aug 4, 2025
e53e1b4
fix xaml styling
noraa-junker Aug 5, 2025
4aff341
Change display name of File Explorer, hide taskbar indicators on othe…
noraa-junker Aug 7, 2025
b9c1181
Add back missing project because of rebase from main:
yeelam-gordon Aug 19, 2025
e7582eb
Add back empty line which is missing during rebase main
yeelam-gordon Aug 19, 2025
200afb5
merge main
noraa-junker Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<PackageVersion Include="WinUIEx" Version="2.2.0" />
<PackageVersion Include="WPF-UI" Version="3.0.5" />
<PackageVersion Include="WyHash" Version="1.0.5" />
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
</ItemGroup>
<ItemGroup Condition="'$(IsExperimentationLive)'!=''">
<!-- Additional dependencies used by experimentation -->
Expand Down
68 changes: 54 additions & 14 deletions PowerToys.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageResizerExt", "src\modu
EndProject
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}") = "PowerToys.ActionRunner", "src\ActionRunner\ActionRunner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActionRunner", "src\ActionRunner\ActionRunner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}"
ProjectSection(ProjectDependencies) = postProject
{17DA04DF-E393-4397-9CF0-84DABE11032E} = {17DA04DF-E393-4397-9CF0-84DABE11032E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApplicationUpdate", "src\common\updating\updating.vcxproj", "{17DA04DF-E393-4397-9CF0-84DABE11032E}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updating", "src\common\updating\updating.vcxproj", "{17DA04DF-E393-4397-9CF0-84DABE11032E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "keyboardmanager", "keyboardmanager", "{38BDB927-829B-4C65-9CD9-93FB05D66D65}"
EndProject
Expand Down Expand Up @@ -220,7 +220,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder.Uni
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}") = "spdlog", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logging", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.System", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.System\Microsoft.PowerToys.Run.Plugin.System.csproj", "{FD8EB419-FF9C-4D88-BB6F-BF6CED37747B}"
EndProject
Expand All @@ -239,7 +239,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Interop.Tests", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "notifications", "notifications", "{D92131D6-7610-4D60-A7DB-1C169783F83B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notifications", "src\common\notifications\notifications.vcxproj", "{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "notifications", "src\common\notifications\notifications.vcxproj", "{1D5BE09D-78C0-4FD7-AF00-AE7C1AF7C525}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackgroundActivatorDLL", "src\common\notifications\BackgroundActivatorDLL\BackgroundActivatorDLL.vcxproj", "{031AC72E-FA28-4AB7-B690-6F7B9C28AA73}"
ProjectSection(ProjectDependencies) = postProject
Expand All @@ -248,7 +248,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackgroundActivatorDLL", "s
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BackgroundActivator", "src\common\notifications\BackgroundActivator\BackgroundActivator.vcxproj", "{0B593A6C-4143-4337-860E-DB5710FB87DB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "src\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "src\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "interop", "interop", "{5A7818A8-109C-4E1C-850D-1A654E234B0E}"
EndProject
Expand Down Expand Up @@ -577,7 +577,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings.DSC.Sche
{020A7474-3601-4160-A159-D7B70B77B15F} = {020A7474-3601-4160-A159-D7B70B77B15F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewPlus.ShellExtension", "src\modules\NewPlus\NewShellExtensionContextMenu\NewShellExtensionContextMenu.vcxproj", "{8ACB33D9-C95B-47D4-8363-9731EE0930A0}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewShellExtensionContextMenu", "src\modules\NewPlus\NewShellExtensionContextMenu\NewShellExtensionContextMenu.vcxproj", "{8ACB33D9-C95B-47D4-8363-9731EE0930A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "New+", "New+", "{CA716AE6-FE5C-40AC-BB8F-2C87912687AC}"
EndProject
Expand Down Expand Up @@ -616,6 +616,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesLauncher", "src\m
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WorkspacesWindowArranger", "src\modules\Workspaces\WorkspacesWindowArranger\WorkspacesWindowArranger.vcxproj", "{37D07516-4185-43A4-924F-3C7A5D95ECF6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ShortcutGuideV2", "ShortcutGuideV2", "{21275C57-1C20-4F07-8A56-21BFA8363BDB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShortcutGuide.Ui", "src\modules\ShortcutGuideV2\ShortcutGuide.Ui\ShortcutGuide.Ui.csproj", "{CA631195-3E02-4796-9272-515AE0A13CDD}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "src\common\Telemetry\EtwTrace\EtwTrace.vcxproj", "{8F021B46-362B-485C-BFBA-CCF83E820CBD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MouseWithoutBorders.UnitTests", "src\modules\MouseWithoutBorders\MouseWithoutBorders.UnitTests\MouseWithoutBorders.UnitTests.csproj", "{66614C26-314C-4B91-9071-76133422CFEF}"
Expand Down Expand Up @@ -712,6 +716,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CmdPalKeyboardService", "sr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerRename.FuzzingTest", "src\modules\powerrename\PowerRename.FuzzingTest\PowerRename.FuzzingTest.vcxproj", "{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShortcutGuide.IndexYmlGenerator", "src\modules\ShortcutGuideV2\ShortcutGuide.IndexYmlGenerator\ShortcutGuide.IndexYmlGenerator\ShortcutGuide.IndexYmlGenerator.csproj", "{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShortcutGuide.CPPProject", "src\modules\ShortcutGuideV2\ShortcutGuide.CPPProject\ShortcutGuide.CPPProject.vcxproj", "{C992FD2C-83B8-4941-9FC1-09730068D8EC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Expand Down Expand Up @@ -2248,6 +2256,18 @@ Global
{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|ARM64.Build.0 = Release|ARM64
{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x64.ActiveCfg = Release|x64
{37D07516-4185-43A4-924F-3C7A5D95ECF6}.Release|x64.Build.0 = Release|x64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Debug|ARM64.ActiveCfg = Debug|ARM64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Debug|ARM64.Build.0 = Debug|ARM64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Debug|ARM64.Deploy.0 = Debug|ARM64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Debug|x64.ActiveCfg = Debug|x64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Debug|x64.Build.0 = Debug|x64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Debug|x64.Deploy.0 = Debug|x64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Release|ARM64.ActiveCfg = Release|ARM64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Release|ARM64.Build.0 = Release|ARM64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Release|ARM64.Deploy.0 = Release|ARM64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Release|x64.ActiveCfg = Release|x64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Release|x64.Build.0 = Release|x64
{CA631195-3E02-4796-9272-515AE0A13CDD}.Release|x64.Deploy.0 = Release|x64
{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|ARM64.Build.0 = Debug|ARM64
{8F021B46-362B-485C-BFBA-CCF83E820CBD}.Debug|x64.ActiveCfg = Debug|x64
Expand Down Expand Up @@ -2584,6 +2604,14 @@ Global
{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|ARM64.Build.0 = Release|ARM64
{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.ActiveCfg = Release|x64
{64B88F02-CD88-4ED8-9624-989A800230F9}.Release|x64.Build.0 = Release|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.ActiveCfg = Debug|ARM64
{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|ARM64.Build.0 = Debug|ARM64
{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2}.Debug|x64.ActiveCfg = Debug|x64
Expand All @@ -2598,14 +2626,22 @@ Global
{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|ARM64.ActiveCfg = Release|ARM64
{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.ActiveCfg = Release|x64
{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E}.Release|x64.Build.0 = Release|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.ActiveCfg = Debug|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|ARM64.Build.0 = Debug|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.ActiveCfg = Debug|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Debug|x64.Build.0 = Debug|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.ActiveCfg = Release|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|ARM64.Build.0 = Release|ARM64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.ActiveCfg = Release|x64
{0217E86E-3476-9946-DE8E-9D200CEBD47A}.Release|x64.Build.0 = Release|x64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Debug|ARM64.ActiveCfg = Debug|ARM64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Debug|ARM64.Build.0 = Debug|ARM64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Debug|x64.ActiveCfg = Debug|x64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Debug|x64.Build.0 = Debug|x64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Release|ARM64.ActiveCfg = Release|ARM64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Release|ARM64.Build.0 = Release|ARM64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Release|x64.ActiveCfg = Release|x64
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B}.Release|x64.Build.0 = Release|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Debug|ARM64.ActiveCfg = Debug|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Debug|ARM64.Build.0 = Debug|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Debug|x64.ActiveCfg = Debug|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Debug|x64.Build.0 = Debug|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Release|ARM64.ActiveCfg = Release|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Release|ARM64.Build.0 = Release|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Release|x64.ActiveCfg = Release|x64
{C992FD2C-83B8-4941-9FC1-09730068D8EC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2831,6 +2867,8 @@ Global
{367D7543-7DBA-4381-99F1-BF6142A996C4} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
{2CAC093E-5FCF-4102-9C2C-AC7DD5D9EB96} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
{37D07516-4185-43A4-924F-3C7A5D95ECF6} = {A2221D7E-55E7-4BEA-90D1-4F162D670BBF}
{21275C57-1C20-4F07-8A56-21BFA8363BDB} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
{CA631195-3E02-4796-9272-515AE0A13CDD} = {21275C57-1C20-4F07-8A56-21BFA8363BDB}
{8F021B46-362B-485C-BFBA-CCF83E820CBD} = {8F62026A-294B-41C6-8839-87463613F216}
{66614C26-314C-4B91-9071-76133422CFEF} = {B6C42F16-73EB-477E-8B0D-4E6CF6C20AAC}
{3846508C-77EB-4034-A702-F8BB263C4F79} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
Expand Down Expand Up @@ -2879,6 +2917,8 @@ Global
{0217E86E-3476-9946-DE8E-9D200CEBD47A} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
{5F63C743-F6CE-4DBA-A200-2B3F8A14E8C2} = {3846508C-77EB-4034-A702-F8BB263C4F79}
{2694E2FB-DCD5-4BFF-A418-B6C3C7CE3B8E} = {89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}
{D640B00C-9149-4C4F-8B7D-E2B8B2590A0B} = {21275C57-1C20-4F07-8A56-21BFA8363BDB}
{C992FD2C-83B8-4941-9FC1-09730068D8EC} = {21275C57-1C20-4F07-8A56-21BFA8363BDB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
Expand Down
6 changes: 0 additions & 6 deletions src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,12 @@
<ClInclude Include="Generated Files\resource.h" />
<ClInclude Include="native_event_waiter.h" />
<ClInclude Include="overlay_window.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="resource.base.h" />
<ClInclude Include="ShortcutGuideSettings.h" />
<ClInclude Include="ShortcutGuideConstants.h" />
<ClInclude Include="shortcut_guide.h" />
<ClInclude Include="start_visible.h" />
<ClInclude Include="target_state.h" />
<ClInclude Include="tasklist_positions.h" />
<ClInclude Include="trace.h" />
</ItemGroup>
<ItemGroup>
Expand All @@ -83,13 +81,9 @@
<ClCompile Include="main.cpp" />
<ClCompile Include="native_event_waiter.cpp" />
<ClCompile Include="overlay_window.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="shortcut_guide.cpp" />
<ClCompile Include="start_visible.cpp" />
<ClCompile Include="target_state.cpp" />
<ClCompile Include="tasklist_positions.cpp" />
<ClCompile Include="trace.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down
86 changes: 73 additions & 13 deletions src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="animation.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand Down Expand Up @@ -51,9 +48,6 @@
<ClInclude Include="target_state.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="tasklist_positions.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="trace.h">
<Filter>Header Files</Filter>
</ClInclude>
Expand All @@ -68,9 +62,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="pch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand Down Expand Up @@ -101,9 +92,6 @@
<ClCompile Include="target_state.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="tasklist_positions.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="trace.cpp">
<Filter>Source Files</Filter>
</ClCompile>
Expand All @@ -116,7 +104,79 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<CopyFileToFolders Include="Assets\ShortcutGuide\**">
<CopyFileToFolders Include="Assets\ShortcutGuide\1.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\2.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\3.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\4.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\5.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\6.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\7.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\8.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\9.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\no_active_window.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\overlay.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\overlay_portrait.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\0.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\1.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\2.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\3.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\4.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\5.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\6.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\7.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\8.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\9.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\no_active_window.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\overlay.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
<CopyFileToFolders Include="Assets\ShortcutGuide\overlay_portrait.svg">
<Filter>Resource Files</Filter>
</CopyFileToFolders>
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/modules/ShortcutGuide/ShortcutGuide/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#pragma once
#define NOMINMAX
#include <vector>
#include <winrt/base.h>
#include <UIAutomation.h>
#include <windows.h>
#include <winrt/Windows.Foundation.h>
#include <winrt/Windows.Foundation.Collections.h>
#include <Windows.h>
#include <dxgi1_3.h>
#include <d3d11_2.h>
#include <d2d1_3.h>
Expand All @@ -24,6 +26,4 @@
#include <stdexcept>
#include <tuple>
#include <unordered_set>
#include <string>
#include <filesystem>
#include <common/logger/logger.h>
#include <filesystem>
Loading
Loading