Skip to content

Commit

Permalink
b/216743374 Add 'Help > Keyboard shortcuts' menu item (#612)
Browse files Browse the repository at this point in the history
* Replace RDP-specific shortcuts window by wiki page
* Remove 'Desktop > Shortcuts' menu item
* Add 'Help > Keyboard shortcuts' menu item
  • Loading branch information
jpassing authored Feb 11, 2022
1 parent 91090b9 commit 30626c2
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 313 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ public static class HelpTopics
"Documentation",
"https://github.com/GoogleCloudPlatform/iap-desktop/wiki");

public static readonly IHelpTopic Shortcuts = new HelpTopic(
"Keyboard shortcuts",
"https://github.com/GoogleCloudPlatform/iap-desktop/wiki/Keyboard-shortcuts");

public static readonly IHelpTopic BrowserIntegration = new HelpTopic(
"Browser Integration",
"https://github.com/GoogleCloudPlatform/iap-desktop/wiki/Browser-Integration");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,6 @@
<Compile Include="Views\RemoteDesktop\RemoteDesktopPane.Designer.cs">
<DependentUpon>RemoteDesktopPane.cs</DependentUpon>
</Compile>
<Compile Include="Views\RemoteDesktop\ShortcutsWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Views\RemoteDesktop\ShortcutsWindow.Designer.cs">
<DependentUpon>ShortcutsWindow.cs</DependentUpon>
</Compile>
<Compile Include="Views\RemoteDesktop\UnsafeNativeMethods.cs" />
<Compile Include="Views\SshTerminal\SshAuthenticationPromptDialog.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -298,9 +292,6 @@
<EmbeddedResource Include="Views\RemoteDesktop\RemoteDesktopPane.resx">
<DependentUpon>RemoteDesktopPane.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Views\RemoteDesktop\ShortcutsWindow.resx">
<DependentUpon>ShortcutsWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Views\SshTerminal\SshAuthenticationPromptDialog.resx">
<DependentUpon>SshAuthenticationPromptDialog.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -322,7 +313,6 @@
<None Include="Resources\Connect_16.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Shortcuts.rtf" />
<None Include="Resources\Tunnel_16.png" />
</ItemGroup>
<ItemGroup>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,6 @@ public ShellExtension(IServiceProvider serviceProvider)
Image = Resources.Disconnect_16,
ShortcutKeys = Keys.Control | Keys.F4
});
desktopMenu.AddCommand(
new Command<IMainForm>(
"&Keyboard shortcuts",
_ => GetCommandStateWhenActiveRemoteDesktopSessionRequired(),
_ => new ShortcutsWindow().Show(this.window)));
desktopMenu.AddSeparator();
desktopMenu.AddCommand(
new Command<IMainForm>(
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

11 changes: 11 additions & 0 deletions sources/Google.Solutions.IapDesktop/Windows/MainForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 30626c2

Please sign in to comment.