Shortcut Guide V2 #40834

noraa-junker · 2025-07-27T12:48:22Z

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Todo list:

Work for future PRs:

Localization of built-in shortcut files
Further customization (we can wait on user feedback for that)
Reimplement holding windows key

Images

Validation Steps Performed

…eMethods.cs

…change

yeelam-gordon · 2025-08-19T01:18:00Z

src/modules/ShortcutGuide/ShortcutGuide/tasklist_positions.cpp

+        else if (wcscmp(class_name, L"Shell_SecondaryTrayWnd") == 0)
+        {
+            // Secondary taskbar structure
+            HWND workerw = FindWindowExW(taskbar_hwnd, 0, L"WorkerW", nullptr);


We can rename the variable like worker_hwnd?

yeelam-gordon · 2025-08-19T01:18:05Z

src/modules/ShortcutGuide/ShortcutGuide/tasklist_positions.cpp

+        {
+            // Secondary taskbar structure
+            HWND workerw = FindWindowExW(taskbar_hwnd, 0, L"WorkerW", nullptr);
+            if (!workerw)


We can rename the variable like worker_hwnd?

yeelam-gordon · 2025-08-19T01:18:09Z

src/modules/ShortcutGuide/ShortcutGuide/tasklist_positions.cpp

+            HWND workerw = FindWindowExW(taskbar_hwnd, 0, L"WorkerW", nullptr);
+            if (!workerw)
+                return;
+            tasklist_hwnd = FindWindowExW(workerw, 0, L"MSTaskListWClass", nullptr);


We can rename the variable like worker_hwnd?

yeelam-gordon · 2025-08-19T01:19:32Z

...GuideV2/ShortcutGuide.IndexYmlGenerator/ShortcutGuide.IndexYmlGenerator/IndexYmlGenerator.cs

+using ShortcutGuide.Models;
+using YamlDotNet.Serialization;
+
+// This should all be outsourced to WinGet in the future


Let's pick other words.

yeelam-gordon · 2025-08-19T01:21:31Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Assets/ShortcutGuide/+WindowsNT.Shell.en-US.yml

+            Alt: false
+            Keys:
+              - "/"
+      - Name: Open Gamebar


If we make it as "Open Game Bar", may be the spelling check will be happier.
And I see its official name is two words as well.

yeelam-gordon · 2025-08-19T01:15:43Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/PowerToysShortcutsPopulator.cs

+        }
+
+        [GeneratedRegex(@"# <Populate start>[\s\S\n\r]*# <Populate end>")]
+        private static partial Regex PoulateRegex();


It is just a typo, should rename to PopulateRegex.

yeelam-gordon · 2025-08-19T01:16:00Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Models/ShortcutPageParameters.cs

+{
+    internal struct ShortcutPageParameters
+    {
+        public static SeachFilterObservable SearchFilter = new();


It should be typo? It should be SearchFilterObservable.

yeelam-gordon · 2025-08-19T01:16:12Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Models/ShortcutPageParameters.cs

+
+        public static FrameHeightObservable FrameHeight = new();
+
+        internal sealed class SeachFilterObservable


It should be typo? It should be SearchFilterObservable.

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Strings/en-us/Resources.resw

+  </data>
+  <data name="PinShortcut" xml:space="preserve">
+    <value>Pin</value>
+    <comment>Refers to the action of pinning something on a pinboard</comment>


src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Strings/en-us/Resources.resw

+  </data>
+  <data name="UnpinShortcut" xml:space="preserve">
+    <value>Unpin</value>
+    <comment>Refers to the action of unpinning something from a pinboard</comment>


… CPPProject

…t/PowerToys into feature/shortcutguidev2

src/modules/ShortcutGuide/ShortcutGuide.CPPProject/tasklist_positions.cpp

src/modules/ShortcutGuide/ShortcutGuide.IndexYmlGenerator/IndexYmlGenerator.cs

src/modules/ShortcutGuide/ShortcutGuide.Ui/Assets/ShortcutGuide/+WindowsNT.Shell.en-US.yml

src/modules/ShortcutGuide/ShortcutGuide.Ui/Helpers/PowerToysShortcutsPopulator.cs

src/modules/ShortcutGuide/ShortcutGuide.Ui/Models/ShortcutPageParameters.cs

src/modules/ShortcutGuide/ShortcutGuide.Ui/Strings/en-us/Resources.resw

…t/PowerToys into feature/shortcutguidev2

…kbar indicators

…r pages then Windows -> Overview and fix height of Windows -> Overview

yeelam-gordon · 2025-08-19T00:59:37Z

@noraa-junker, I rebased this with latest main.

While, this PR will conflict with another two PRs that will be going in soon.

Wix migration. @vanzue
Given there are setup change in this PR
Shortcut conflict detection @shuaiyuanxx
There are common change which we should be no worry in case there is a "new module" or "new shortcut" added for any modules, such that we will not miss it on any changes.

Given we want to cut the build at the end of this week for 0.94, the chance we resolve all the conflict will really need extra effort in case.

yeelam-gordon

Shawn will help further on review, since his PR on shortcut conflict detection (for PowerToys itself + system key) should have many commonality and knowledge on code change.

yeelam-gordon · 2025-08-19T00:51:49Z

src/modules/ShortcutGuide/ShortcutGuide.Ui/Helpers/PowerToysShortcutsPopulator.cs

+
+            content = new(PopulateRegex().Replace(content.ToString(), populateStartString + Environment.NewLine));
+
+            ISettingsUtils settingsUtils = new SettingsUtils();


@shuaiyuanxx, I believe the following code can be replace with your one?
Surprisingly or not, PowerToys has many "naming conversion" to work correctly, even they defined in seperate file, e.g.

PowerToys/src/settings-ui/Settings.UI.Library/Utilities/GetSettingCommandLineCommand.cs

Line 60 in 8737de2

moduleSettings.Add("Enabled", typeof(EnabledModules).GetProperty(moduleName).GetValue(enabledModules));

Actually the EnabledModules' PropertyName should be the same as the Setting's ModuleName.

BTW, I see it need two resource string below for each, why we only need to return one in our interface in the shortcut conflict detection one? (I see below one is the Module's name, one is the shortcut's name)

This file can be simplified by leveraging the ModuleHelper class. It provides method for checking the module is enabled or not, and can get the module header.

src/modules/ShortcutGuide/ShortcutGuideModuleInterface/dllmain.cpp

src/settings-ui/Settings.UI.Library/ShortcutGuideSettings.cs

yeelam-gordon · 2025-08-19T01:15:43Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/PowerToysShortcutsPopulator.cs

+        }
+
+        [GeneratedRegex(@"# <Populate start>[\s\S\n\r]*# <Populate end>")]
+        private static partial Regex PoulateRegex();


It is just a typo, should rename to PopulateRegex.

yeelam-gordon · 2025-08-19T01:21:31Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Assets/ShortcutGuide/+WindowsNT.Shell.en-US.yml

+            Alt: false
+            Keys:
+              - "/"
+      - Name: Open Gamebar


If we make it as "Open Game Bar", may be the spelling check will be happier.
And I see its official name is two words as well.

yeelam-gordon · 2025-08-19T01:22:05Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Assets/ShortcutGuide/+WindowsNT.Shell.en-US.yml

+            Shift: false
+            Alt: false
+            Keys:
+              - "<PrtSc>"


Is it PrtScn?

yeelam-gordon · 2025-08-19T01:22:18Z

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/PowerToysShortcutsPopulator.cs

+            const string populateStartString = "# <Populate start>";
+            const string populateEndString = "# <Populate end>";
+
+            content = PoulateRegex().Replace(content, populateStartString + Environment.NewLine);


It is just a typo, should rename to PopulateRegex.

yeelam-gordon · 2025-08-19T01:29:48Z

src/modules/ShortcutGuide/ShortcutGuide.Ui/Models/ShortcutEntry.cs

+                        VerticalAlignment = VerticalAlignment.Center,
+
+                        // Use monospaced font to ensure the text doesn't move
+                        FontFamily = new("Courier New"),


@niels9001, any suggestion here?

yeelam-gordon · 2025-08-19T01:39:40Z

src/modules/ShortcutGuide/ShortcutGuide.IndexYmlGenerator/IndexYmlGenerator.cs

+            // Todo: Take the default shell name from the settings or environment variable, default to "+WindowsNT.Shell"
+            indexFile.DefaultShellName = "+WindowsNT.Shell";
+
+            Serializer serializer = new();


I don't understand the search logic now.
e.g.
I go to PowerToys General, search for "H"
It shows me 3 results, but I think only first one one make sense?

And then I try to search for "P" and /" and see... "P" gives me many many results, and "/" gives me no result.

I also try to search for Shift, Ctrl, Alt, no result as well.

I see... It search for the "Name" only now, shortcut value is not included.

@vanzue, given you are doing setting search now, any suggestion from you to this PR related to search?

yeelam-gordon · 2025-08-19T01:58:59Z

src/modules/ShortcutGuide/ShortcutGuide.Ui/ShortcutGuideXAML/MainWindow.xaml.cs

+            Close();
+        }
+
+        private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)


When I already put something as part of search, e.g. "H"
Then when I switch to another Tab, e.g. Windows -> Clipboard to PowerToys, it will not obey with the search filter.

yeelam-gordon · 2025-08-19T02:21:06Z

doc/devdocs/modules/shortcut_guide.md

- Application-specific shortcuts based on the active application
- Additional shortcuts beyond Windows key combinations
- PowerToys shortcuts
+- Implementing with WinGet to get new shortcut manifest files


Do you mean in the future, there will be really like "+WindowsNT.Shell" avaliable in winget, and it can also define the localized Shortcut information there?

yeelam-gordon · 2025-08-19T02:22:40Z

src/modules/ShortcutGuide/ShortcutGuide.IndexYmlGenerator/IndexYmlGenerator.cs

+            // Todo: Take the default shell name from the settings or environment variable, default to "+WindowsNT.Shell"
+            indexFile.DefaultShellName = "+WindowsNT.Shell";
+
+            Serializer serializer = new();


I see... It search for the "Name" only now, shortcut value is not included.

yeelam-gordon · 2025-08-19T02:23:33Z

src/modules/ShortcutGuide/ShortcutGuide.IndexYmlGenerator/IndexYmlGenerator.cs

+            // Todo: Take the default shell name from the settings or environment variable, default to "+WindowsNT.Shell"
+            indexFile.DefaultShellName = "+WindowsNT.Shell";
+
+            Serializer serializer = new();


@vanzue, given you are doing setting search now, any suggestion from you to this PR related to search?

noraa-junker added 18 commits October 14, 2024 19:02

[WIP] Shortcut Guide V2

03587ae

Changed style a little bit

7a6189b

Push

c81a423

Push

d5f5500

Code cleanup

22dc870

Fix display on monitor with mouse and move all NaticeMethods to Nativ…

a14c458

…eMethods.cs

Fix error messages and read application titles out of index manifest

da7b789

Rename YmlInterpreter to ManifestInterpreter

6952deb

Merge main

a292a92

push

b16b457

Add support for multiple shortcuts

7ce5182

Add copying keyboard manifests and other improvements

569f072

Add keyboard accelerator to the search box

54d176c

Handle errors displaying app and close window automatically on focus …

0b823ea

…change

Add taskbar indicators

7596e96

Refactoring and localisation

46df486

Remove some hosts references and fix close button

da77396

Refactoring

a6b7614

github-advanced-security bot found potential problems Jul 27, 2025

View reviewed changes

noraa-junker added 6 commits July 27, 2025 16:40

Remove old Shortcut Guide

d73ab4f

Remove legacy shortcut behaviour

07760e4

Fix closing by shortcut add closing by ESC and fix missing files from…

1580279

… CPPProject

Merge main in

ba40989

Merge main in

3e75fb0

Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…

95e0a20

…t/PowerToys into feature/shortcutguidev2

github-advanced-security bot found potential problems Jul 27, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

noraa-junker added 2 commits July 27, 2025 18:00

Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…

e26bf2a

…t/PowerToys into feature/shortcutguidev2

Merge branch 'feature/shortcutguidev2' of https://github.com/microsof…

be799dd

…t/PowerToys into feature/shortcutguidev2

This comment has been minimized.

Sign in to view

noraa-junker and others added 20 commits August 19, 2025 08:05

Fix building in release mode and some other stuff

6d7d5f9

Fix xaml styling

5c11c75

Fix arm64 configuration

b553add

So something was not right. Hopefully this fixes it.

387b7e9

That is a kinda embarrasing error

3b7df37

Remove failing test

ac789a7

Forgot notice.md and CPPProject has some trouble buildinng release x64

cd844e3

Make some adjustants to how the windows key is displayed

dc0877e

Adress some PR comments and fix some bugs

bb16ae1

Fix xaml styling

19f9506

Factor out TaskbarIndicator

72be095

Fix styling

dceb1d7

Change some StaticResources to ThemeResources and change style of tas…

4853bd0

…kbar indicators

Change oobe design

a764bf3

close infotip when link is clicked and remove unneccesairy grid

0917a64

git messed up

73f718c

fix xaml styling

e53e1b4

Change display name of File Explorer, hide taskbar indicators on othe…

4aff341

…r pages then Windows -> Overview and fix height of Windows -> Overview

Add back missing project because of rebase from main:

b9c1181

Add back empty line which is missing during rebase main

e7582eb

yeelam-gordon requested review from shuaiyuanxx and vanzue August 19, 2025 00:53

yeelam-gordon force-pushed the feature/shortcutguidev2 branch from 2dbc631 to e7582eb Compare August 19, 2025 00:56

yeelam-gordon reviewed Aug 19, 2025

View reviewed changes

cinnamon-msft modified the milestones: PowerToys 0.94, PowerToys 0.95 Aug 20, 2025

merge main

200afb5

yeelam-gordon mentioned this pull request Sep 5, 2025

WinGet manifest Keyboard Shortcuts extension #35433

Closed

11 tasks


		public static FrameHeightObservable FrameHeight = new();

		internal sealed class SeachFilterObservable


		content = new(PopulateRegex().Replace(content.ToString(), populateStartString + Environment.NewLine));

		ISettingsUtils settingsUtils = new SettingsUtils();

Shortcut Guide V2 #40834

Are you sure you want to change the base?

Shortcut Guide V2 #40834

Uh oh!

Conversation

noraa-junker commented Jul 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Choose a reason for hiding this comment

Uh oh!

Check failure

Check failure

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

yeelam-gordon commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yeelam-gordon left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

noraa-junker commented Jul 27, 2025 •

edited

Loading

yeelam-gordon commented Aug 19, 2025 •

edited

Loading