Skip to content

Commit

Permalink
Refactored keyboard shortcuts assignment to work around international…
Browse files Browse the repository at this point in the history 
… VS versions compatibility.
  • Loading branch information
Sergey M committed Aug 10, 2020
1 parent 66e2513 commit d7b6b0c
Show file tree
Hide file tree
Showing 4 changed files with 184 additions and 140 deletions.
10 changes: 5 additions & 5 deletions DPackRx/Options/OptionsGeneralControl.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<UserControl x:Class="DPackRx.Options.OptionsGeneralControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:DPackRx.Options"
mc:Ignorable="d"
mc:Ignorable="d"
d:DesignHeight="200" d:DesignWidth="400">

<UserControl.Resources>
Expand All @@ -19,7 +19,7 @@
<DockPanel LastChildFill="False">
<TextBlock DockPanel.Dock="Top" Style="{StaticResource TextBlockTop}" />

<Button DockPanel.Dock="Top" Content="Assign Keyboard Shortcuts" Style="{StaticResource ButtonLarge}" Margin="0"
<Button DockPanel.Dock="Top" Content="Keyboard Shortcuts" ToolTip="Assign keyboard shortcuts" Style="{StaticResource ButtonRegular}" Margin="0"
Command="{Binding AssignShortcutsCommand}" />

<Border DockPanel.Dock="Top" Style="{StaticResource BorderDiv}" />
Expand All @@ -33,7 +33,7 @@

<Border DockPanel.Dock="Top" Style="{StaticResource BorderDiv}" />

<Button DockPanel.Dock="Top" Content="Reset" ToolTip="Reset all settings" Style="{StaticResource ButtonRegular}"
<Button DockPanel.Dock="Top" Content="Reset All" ToolTip="Reset all settings" Style="{StaticResource ButtonRegular}"
Command="{Binding ResetAllCommand}" />
</DockPanel>
</UserControl>
30 changes: 16 additions & 14 deletions DPackRx/Package/CommandBindings.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,22 @@ public static ICollection<CommandNameAttribute> Commands
{
if (_commands == null)
{
_commands = new List<CommandNameAttribute>();
_commands.Add(new CommandNameAttribute("View.ViewCode", "F7", ContextGuids.vsContextGuidWindowsFormsDesigner));
_commands.Add(new CommandNameAttribute("View.ViewCode", "F7", ContextGuids.vsContextGuidHTMLSourceView));
_commands.Add(new CommandNameAttribute("View.ViewCode", "F7", ContextGuids.vsContextGuidTextEditor));
_commands.Add(new CommandNameAttribute("View.ViewDesigner", "F7", ContextGuids.vsContextGuidWindowsFormsDesigner));
_commands.Add(new CommandNameAttribute("View.ViewDesigner", "F7", ContextGuids.vsContextGuidHTMLSourceView));
_commands.Add(new CommandNameAttribute("View.ViewDesigner", "F7", ContextGuids.vsContextGuidTextEditor));
_commands.Add(new CommandNameAttribute("EditorContextMenus.CodeWindow.RemoveAndSort", "Global::Ctrl+Shift+Alt+U"));
_commands.Add(new CommandNameAttribute("View.FindResults1", "Global::Ctrl+K, Ctrl+1"));
_commands.Add(new CommandNameAttribute("View.FindResults2", "Global::Ctrl+K, Ctrl+2"));

// Fix bookmark shortcut collisions
_commands.Add(new CommandNameAttribute("Edit.GoToMember", "Global::Ctrl+Shift+M"));
_commands.Add(new CommandNameAttribute("Edit.GoToType", "Global::Ctrl+Shift+T"));
_commands = new List<CommandNameAttribute>
{
new CommandNameAttribute("View.ViewCode", "F7", ContextGuids.vsContextGuidWindowsFormsDesigner),
new CommandNameAttribute("View.ViewCode", "F7", ContextGuids.vsContextGuidHTMLSourceView),
new CommandNameAttribute("View.ViewCode", "F7", ContextGuids.vsContextGuidTextEditor),
new CommandNameAttribute("View.ViewDesigner", "F7", ContextGuids.vsContextGuidWindowsFormsDesigner),
new CommandNameAttribute("View.ViewDesigner", "F7", ContextGuids.vsContextGuidHTMLSourceView),
new CommandNameAttribute("View.ViewDesigner", "F7", ContextGuids.vsContextGuidTextEditor),
new CommandNameAttribute("EditorContextMenus.CodeWindow.RemoveAndSort", "Ctrl+Shift+Alt+U"),
new CommandNameAttribute("View.FindResults1", "Ctrl+K, Ctrl+1"),
new CommandNameAttribute("View.FindResults2", "Ctrl+K, Ctrl+2"),

// Fix bookmark shortcut collisions
new CommandNameAttribute("Edit.GoToMember", "Ctrl+Shift+M"),
new CommandNameAttribute("Edit.GoToType", "Ctrl+Shift+T")
};
}

return _commands;
Expand Down
110 changes: 55 additions & 55 deletions DPackRx/Package/CommandIDs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,75 +5,75 @@ namespace DPackRx.Package
/// </summary>
public static class CommandIDs
{
[CommandName("Tools.AllMembers", "Global::Alt+G")] public const int CODE_BROWSER = 100;
[CommandName("Tools.ClassesInterfacesOnly", "Global::Alt+C")] public const int CODE_BROWSER_CI = 101;
[CommandName("Tools.MethodsOnly", "Global::Alt+M")] public const int CODE_BROWSER_M = 102;
[CommandName("Tools.PropertiesOnly", "Global::Shift+Alt+P")] public const int CODE_BROWSER_P = 103;
[CommandName("Tools.AllMembers", "Alt+G")] public const int CODE_BROWSER = 100;
[CommandName("Tools.ClassesInterfacesOnly", "Alt+C")] public const int CODE_BROWSER_CI = 101;
[CommandName("Tools.MethodsOnly", "Alt+M")] public const int CODE_BROWSER_M = 102;
[CommandName("Tools.PropertiesOnly", "Shift+Alt+P")] public const int CODE_BROWSER_P = 103;

[CommandName("Tools.FileBrowser", "Global::Alt+U")] public const int FILE_BROWSER = 200;
[CommandName("Tools.FileBrowser", "Alt+U")] public const int FILE_BROWSER = 200;

[CommandName("Edit.ToggleBookmark1", "Global::Ctrl+Shift+1")] public const int BOOKMARK_SET_1 = 500;
[CommandName("Edit.ToggleBookmark2", "Global::Ctrl+Shift+2")] public const int BOOKMARK_SET_2 = 501;
[CommandName("Edit.ToggleBookmark3", "Global::Ctrl+Shift+3")] public const int BOOKMARK_SET_3 = 502;
[CommandName("Edit.ToggleBookmark4", "Global::Ctrl+Shift+4")] public const int BOOKMARK_SET_4 = 503;
[CommandName("Edit.ToggleBookmark5", "Global::Ctrl+Shift+5")] public const int BOOKMARK_SET_5 = 504;
[CommandName("Edit.ToggleBookmark6", "Global::Ctrl+Shift+6")] public const int BOOKMARK_SET_6 = 505;
[CommandName("Edit.ToggleBookmark7", "Global::Ctrl+Shift+7")] public const int BOOKMARK_SET_7 = 506;
[CommandName("Edit.ToggleBookmark8", "Global::Ctrl+Shift+8")] public const int BOOKMARK_SET_8 = 507;
[CommandName("Edit.ToggleBookmark9", "Global::Ctrl+Shift+9")] public const int BOOKMARK_SET_9 = 508;
[CommandName("Edit.ToggleBookmark0", "Global::Ctrl+Shift+0")] public const int BOOKMARK_SET_0 = 509;
[CommandName("Edit.GoToBookmark1", "Global::Ctrl+1")] public const int BOOKMARK_GET_1 = 510;
[CommandName("Edit.GoToBookmark2", "Global::Ctrl+2")] public const int BOOKMARK_GET_2 = 511;
[CommandName("Edit.GoToBookmark3", "Global::Ctrl+3")] public const int BOOKMARK_GET_3 = 512;
[CommandName("Edit.GoToBookmark4", "Global::Ctrl+4")] public const int BOOKMARK_GET_4 = 513;
[CommandName("Edit.GoToBookmark5", "Global::Ctrl+5")] public const int BOOKMARK_GET_5 = 514;
[CommandName("Edit.GoToBookmark6", "Global::Ctrl+6")] public const int BOOKMARK_GET_6 = 515;
[CommandName("Edit.GoToBookmark7", "Global::Ctrl+7")] public const int BOOKMARK_GET_7 = 516;
[CommandName("Edit.GoToBookmark8", "Global::Ctrl+8")] public const int BOOKMARK_GET_8 = 517;
[CommandName("Edit.GoToBookmark9", "Global::Ctrl+9")] public const int BOOKMARK_GET_9 = 518;
[CommandName("Edit.GoToBookmark0", "Global::Ctrl+0")] public const int BOOKMARK_GET_0 = 519;
[CommandName("Edit.ClearAllFileBookmarks", "Global::Ctrl+K, C")] public const int BOOKMARK_CLEAR_F = 520;
[CommandName("Edit.ClearAllSolutionBookmarks", "Global::Ctrl+K, A")] public const int BOOKMARK_CLEAR_S = 521;
[CommandName("Edit.ToggleGlobalBookmark1", "Global::Ctrl+Shift+Alt+1")] public const int BOOKMARK_SET_GLB_1 = 530;
[CommandName("Edit.ToggleGlobalBookmark2", "Global::Ctrl+Shift+Alt+2")] public const int BOOKMARK_SET_GLB_2 = 531;
[CommandName("Edit.ToggleGlobalBookmark3", "Global::Ctrl+Shift+Alt+3")] public const int BOOKMARK_SET_GLB_3 = 532;
[CommandName("Edit.ToggleGlobalBookmark4", "Global::Ctrl+Shift+Alt+4")] public const int BOOKMARK_SET_GLB_4 = 533;
[CommandName("Edit.ToggleGlobalBookmark5", "Global::Ctrl+Shift+Alt+5")] public const int BOOKMARK_SET_GLB_5 = 534;
[CommandName("Edit.ToggleGlobalBookmark6", "Global::Ctrl+Shift+Alt+6")] public const int BOOKMARK_SET_GLB_6 = 535;
[CommandName("Edit.ToggleGlobalBookmark7", "Global::Ctrl+Shift+Alt+7")] public const int BOOKMARK_SET_GLB_7 = 536;
[CommandName("Edit.ToggleGlobalBookmark8", "Global::Ctrl+Shift+Alt+8")] public const int BOOKMARK_SET_GLB_8 = 537;
[CommandName("Edit.ToggleGlobalBookmark9", "Global::Ctrl+Shift+Alt+9")] public const int BOOKMARK_SET_GLB_9 = 538;
[CommandName("Edit.ToggleGlobalBookmark0", "Global::Ctrl+Shift+Alt+0")] public const int BOOKMARK_SET_GLB_0 = 539;
[CommandName("Edit.GoToGlobalBookmark1", "Global::Ctrl+Alt+1")] public const int BOOKMARK_GET_GLB_1 = 540;
[CommandName("Edit.GoToGlobalBookmark2", "Global::Ctrl+Alt+2")] public const int BOOKMARK_GET_GLB_2 = 541;
[CommandName("Edit.GoToGlobalBookmark3", "Global::Ctrl+Alt+3")] public const int BOOKMARK_GET_GLB_3 = 542;
[CommandName("Edit.GoToGlobalBookmark4", "Global::Ctrl+Alt+4")] public const int BOOKMARK_GET_GLB_4 = 543;
[CommandName("Edit.GoToGlobalBookmark5", "Global::Ctrl+Alt+5")] public const int BOOKMARK_GET_GLB_5 = 544;
[CommandName("Edit.GoToGlobalBookmark6", "Global::Ctrl+Alt+6")] public const int BOOKMARK_GET_GLB_6 = 545;
[CommandName("Edit.GoToGlobalBookmark7", "Global::Ctrl+Alt+7")] public const int BOOKMARK_GET_GLB_7 = 546;
[CommandName("Edit.GoToGlobalBookmark8", "Global::Ctrl+Alt+8")] public const int BOOKMARK_GET_GLB_8 = 547;
[CommandName("Edit.GoToGlobalBookmark9", "Global::Ctrl+Alt+9")] public const int BOOKMARK_GET_GLB_9 = 548;
[CommandName("Edit.GoToGlobalBookmark0", "Global::Ctrl+Alt+0")] public const int BOOKMARK_GET_GLB_0 = 549;
[CommandName("Edit.ToggleBookmark1", "Ctrl+Shift+1")] public const int BOOKMARK_SET_1 = 500;
[CommandName("Edit.ToggleBookmark2", "Ctrl+Shift+2")] public const int BOOKMARK_SET_2 = 501;
[CommandName("Edit.ToggleBookmark3", "Ctrl+Shift+3")] public const int BOOKMARK_SET_3 = 502;
[CommandName("Edit.ToggleBookmark4", "Ctrl+Shift+4")] public const int BOOKMARK_SET_4 = 503;
[CommandName("Edit.ToggleBookmark5", "Ctrl+Shift+5")] public const int BOOKMARK_SET_5 = 504;
[CommandName("Edit.ToggleBookmark6", "Ctrl+Shift+6")] public const int BOOKMARK_SET_6 = 505;
[CommandName("Edit.ToggleBookmark7", "Ctrl+Shift+7")] public const int BOOKMARK_SET_7 = 506;
[CommandName("Edit.ToggleBookmark8", "Ctrl+Shift+8")] public const int BOOKMARK_SET_8 = 507;
[CommandName("Edit.ToggleBookmark9", "Ctrl+Shift+9")] public const int BOOKMARK_SET_9 = 508;
[CommandName("Edit.ToggleBookmark0", "Ctrl+Shift+0")] public const int BOOKMARK_SET_0 = 509;
[CommandName("Edit.GoToBookmark1", "Ctrl+1")] public const int BOOKMARK_GET_1 = 510;
[CommandName("Edit.GoToBookmark2", "Ctrl+2")] public const int BOOKMARK_GET_2 = 511;
[CommandName("Edit.GoToBookmark3", "Ctrl+3")] public const int BOOKMARK_GET_3 = 512;
[CommandName("Edit.GoToBookmark4", "Ctrl+4")] public const int BOOKMARK_GET_4 = 513;
[CommandName("Edit.GoToBookmark5", "Ctrl+5")] public const int BOOKMARK_GET_5 = 514;
[CommandName("Edit.GoToBookmark6", "Ctrl+6")] public const int BOOKMARK_GET_6 = 515;
[CommandName("Edit.GoToBookmark7", "Ctrl+7")] public const int BOOKMARK_GET_7 = 516;
[CommandName("Edit.GoToBookmark8", "Ctrl+8")] public const int BOOKMARK_GET_8 = 517;
[CommandName("Edit.GoToBookmark9", "Ctrl+9")] public const int BOOKMARK_GET_9 = 518;
[CommandName("Edit.GoToBookmark0", "Ctrl+0")] public const int BOOKMARK_GET_0 = 519;
[CommandName("Edit.ClearAllFileBookmarks", "Ctrl+K, C")] public const int BOOKMARK_CLEAR_F = 520;
[CommandName("Edit.ClearAllSolutionBookmarks", "Ctrl+K, A")] public const int BOOKMARK_CLEAR_S = 521;
[CommandName("Edit.ToggleGlobalBookmark1", "Ctrl+Shift+Alt+1")] public const int BOOKMARK_SET_GLB_1 = 530;
[CommandName("Edit.ToggleGlobalBookmark2", "Ctrl+Shift+Alt+2")] public const int BOOKMARK_SET_GLB_2 = 531;
[CommandName("Edit.ToggleGlobalBookmark3", "Ctrl+Shift+Alt+3")] public const int BOOKMARK_SET_GLB_3 = 532;
[CommandName("Edit.ToggleGlobalBookmark4", "Ctrl+Shift+Alt+4")] public const int BOOKMARK_SET_GLB_4 = 533;
[CommandName("Edit.ToggleGlobalBookmark5", "Ctrl+Shift+Alt+5")] public const int BOOKMARK_SET_GLB_5 = 534;
[CommandName("Edit.ToggleGlobalBookmark6", "Ctrl+Shift+Alt+6")] public const int BOOKMARK_SET_GLB_6 = 535;
[CommandName("Edit.ToggleGlobalBookmark7", "Ctrl+Shift+Alt+7")] public const int BOOKMARK_SET_GLB_7 = 536;
[CommandName("Edit.ToggleGlobalBookmark8", "Ctrl+Shift+Alt+8")] public const int BOOKMARK_SET_GLB_8 = 537;
[CommandName("Edit.ToggleGlobalBookmark9", "Ctrl+Shift+Alt+9")] public const int BOOKMARK_SET_GLB_9 = 538;
[CommandName("Edit.ToggleGlobalBookmark0", "Ctrl+Shift+Alt+0")] public const int BOOKMARK_SET_GLB_0 = 539;
[CommandName("Edit.GoToGlobalBookmark1", "Ctrl+Alt+1")] public const int BOOKMARK_GET_GLB_1 = 540;
[CommandName("Edit.GoToGlobalBookmark2", "Ctrl+Alt+2")] public const int BOOKMARK_GET_GLB_2 = 541;
[CommandName("Edit.GoToGlobalBookmark3", "Ctrl+Alt+3")] public const int BOOKMARK_GET_GLB_3 = 542;
[CommandName("Edit.GoToGlobalBookmark4", "Ctrl+Alt+4")] public const int BOOKMARK_GET_GLB_4 = 543;
[CommandName("Edit.GoToGlobalBookmark5", "Ctrl+Alt+5")] public const int BOOKMARK_GET_GLB_5 = 544;
[CommandName("Edit.GoToGlobalBookmark6", "Ctrl+Alt+6")] public const int BOOKMARK_GET_GLB_6 = 545;
[CommandName("Edit.GoToGlobalBookmark7", "Ctrl+Alt+7")] public const int BOOKMARK_GET_GLB_7 = 546;
[CommandName("Edit.GoToGlobalBookmark8", "Ctrl+Alt+8")] public const int BOOKMARK_GET_GLB_8 = 547;
[CommandName("Edit.GoToGlobalBookmark9", "Ctrl+Alt+9")] public const int BOOKMARK_GET_GLB_9 = 548;
[CommandName("Edit.GoToGlobalBookmark0", "Ctrl+Alt+0")] public const int BOOKMARK_GET_GLB_0 = 549;

[CommandName("Edit.TryCatch", "Global::Ctrl+K, X")] public const int SW_TRY_CATCH = 600;
[CommandName("Edit.TryFinally", "Global::Ctrl+K, T")] public const int SW_TRY_FINALLY = 601;
[CommandName("Edit.For", "Global::Ctrl+K, F")] public const int SW_FOR = 602;
[CommandName("Edit.ForEach", "Global::Ctrl+K, E")] public const int SW_FOR_EACH = 603;
[CommandName("Edit.Region", "Global::Ctrl+K, R")] public const int SW_REGION = 604;
[CommandName("Edit.TryCatch", "Ctrl+K, X")] public const int SW_TRY_CATCH = 600;
[CommandName("Edit.TryFinally", "Ctrl+K, T")] public const int SW_TRY_FINALLY = 601;
[CommandName("Edit.For", "Ctrl+K, F")] public const int SW_FOR = 602;
[CommandName("Edit.ForEach", "Ctrl+K, E")] public const int SW_FOR_EACH = 603;
[CommandName("Edit.Region", "Ctrl+K, R")] public const int SW_REGION = 604;

[CommandName("Tools.DPackWebSite")] public const int PROJECT_HOME = 700;
[CommandName("Tools.DPackEmailUs")] public const int SUPPORT_EMAIL = 701;
[CommandName("Tools.DPackOptions")] public const int OPTIONS = 710;

[CommandName("Tools.SolutionStatistics")] public const int CODE_STATS = 800;

[CommandName("Tools.SolutionBackup", "Global::Shift+Alt+B")] public const int BACKUP = 900;
[CommandName("Tools.SolutionBackup", "Shift+Alt+B")] public const int BACKUP = 900;

[CommandName("ProjectandSolutionContextMenus.Solution.CollapseAllProjects", "Global::Shift+Alt+C")] public const int COLLAPSE_SOLUTION_CONTEXT = 1101;
[CommandName("ProjectandSolutionContextMenus.Solution.CollapseAllProjects", "Shift+Alt+C")] public const int COLLAPSE_SOLUTION_CONTEXT = 1101;
[CommandName("ProjectandSolutionContextMenus.ReferenceRoot.Copy")] public const int COPY_REFERENCES_CONTEXT = 1102;
[CommandName("ProjectandSolutionContextMenus.ReferenceRoot.Paste")] public const int PASTE_REFERENCES_CONTEXT = 1103;
[CommandName("ProjectandSolutionContextMenus.ReferenceRoot.Copy")] public const int COPY_REFERENCE_CONTEXT = 1104;
[CommandName("OtherContextMenus.EasyMDIDocumentWindow.LocateInSolutionExplorer", "Global::Shift+Alt+L")] public const int LOCATE_IN_SOLUTION_EXPLORER_CONTEXT = 1105;
[CommandName("OtherContextMenus.EasyMDIDocumentWindow.LocateInSolutionExplorer", "Shift+Alt+L")] public const int LOCATE_IN_SOLUTION_EXPLORER_CONTEXT = 1105;
[CommandName("ProjectandSolutionContextMenus.Project.OpenCommandPrompt")] public const int COMMAND_PROMPT = 1106;
[CommandName("ProjectandSolutionContextMenus.Project.CopyFullPath")] public const int COPY_FULL_PATH = 1107;
}
Expand Down
Loading

0 comments on commit d7b6b0c

Please sign in to comment.