Merge branch 'keyboard'

ILSpy/Commands/ShowDebugSteps.cs

@@ -1,18 +0,0 @@
-#if DEBUG
-
-using ICSharpCode.ILSpy.Docking;
-using ICSharpCode.ILSpy.Properties;
-using ICSharpCode.ILSpy.ViewModels;
-
-namespace ICSharpCode.ILSpy.Commands
-{
-	[ExportMainMenuCommand(Menu = nameof(Resources._View), Header = nameof(Resources._ShowDebugSteps), MenuOrder = 5000)]
-	class ShowDebugSteps : SimpleCommand
-	{
-		public override void Execute(object parameter)
-		{
-			DockWorkspace.Instance.ShowToolPane(DebugStepsPaneModel.PaneContentId);
-		}
-	}
-}
-#endif

ILSpy/Commands/ShowPane.cs

@@ -0,0 +1,35 @@
+using ICSharpCode.ILSpy.Docking;
+using ICSharpCode.ILSpy.Properties;
+using ICSharpCode.ILSpy.ViewModels;
+
+namespace ICSharpCode.ILSpy.Commands
+{
+	[ExportMainMenuCommand(Menu = nameof(Resources._Window), Header = nameof(Resources._Assemblies), MenuCategory = "pane", MenuOrder = 5000)]
+	class ShowAssemblies : SimpleCommand
+	{
+		public override void Execute(object parameter)
+		{
+			DockWorkspace.Instance.ShowToolPane(AssemblyListPaneModel.PaneContentId);
+		}
+	}
+
+	[ExportMainMenuCommand(Menu = nameof(Resources._Window), Header = nameof(Resources._Analyzer), MenuCategory = "pane", MenuOrder = 5000)]
+	class ShowAnalyzer : SimpleCommand
+	{
+		public override void Execute(object parameter)
+		{
+			DockWorkspace.Instance.ShowToolPane(AnalyzerPaneModel.PaneContentId);
+		}
+	}
+
+#if DEBUG
+	[ExportMainMenuCommand(Menu = nameof(Resources._Window), Header = nameof(Resources._ShowDebugSteps), MenuCategory = "pane", MenuOrder = 5000)]
+	class ShowDebugSteps : SimpleCommand
+	{
+		public override void Execute(object parameter)
+		{
+			DockWorkspace.Instance.ShowToolPane(DebugStepsPaneModel.PaneContentId);
+		}
+	}
+#endif
+}

ILSpy/ILSpy.csproj

@@ -134,6 +134,6 @@
 
   <Target Name="ApplyStackExtension" AfterTargets="PostBuildEvent">
     <Exec Condition="'$(VCToolsVersion)'!=''" Command="&quot;$(VCBasePath)Tools\MSVC\$(VCToolsVersion)\bin\Hostx64\x64\editbin.exe&quot; /stack:16777216 &quot;$(TargetPath)&quot;&#xD;&#xA;EXIT 0" />
-    <Exec Command="&quot;$(TargetFrameworkSDKToolsDirectory)sn.exe&quot; -R &quot;$(TargetPath)&quot; &quot;$(SolutionDir)\ICSharpCode.Decompiler\ICSharpCode.Decompiler.snk&quot;" />
+    <Exec Command="&quot;$(TargetFrameworkSDKToolsDirectory)sn.exe&quot; -R &quot;$(TargetPath)&quot; &quot;$(AssemblyOriginatorKeyFile)&quot;" />
   </Target>
 </Project>

ILSpy/MainWindow.xaml

@@ -107,7 +107,7 @@
 				<MenuItem Header="{x:Static properties:Resources.Show_internalTypesMembers}" IsCheckable="True" IsChecked="{Binding SessionSettings.FilterSettings.ApiVisPublicAndInternal}" />
 				<MenuItem Header="{x:Static properties:Resources.Show_allTypesAndMembers}" IsCheckable="True" IsChecked="{Binding SessionSettings.FilterSettings.ApiVisAll}" />
 				<Separator/>
-				<MenuItem Header="{x:Static properties:Resources.Language}">
+				<MenuItem Header="{x:Static properties:Resources.UILanguage}">
 					<MenuItem Header="{x:Static properties:Resources.UILanguage_System}" IsCheckable="True" IsChecked="{Binding SessionSettings.CurrentCulture, Converter={StaticResource cultureSelectionConverter}, ConverterParameter={x:Null}}" />
 					<MenuItem Header="English" IsCheckable="True" IsChecked="{Binding SessionSettings.CurrentCulture, Converter={StaticResource cultureSelectionConverter}, ConverterParameter=en-US}" />
 					<MenuItem Header="中文" IsCheckable="True" IsChecked="{Binding SessionSettings.CurrentCulture, Converter={StaticResource cultureSelectionConverter}, ConverterParameter=zh-Hans}" />

ILSpy/MainWindow.xaml.cs

@@ -371,6 +371,29 @@ namespace ICSharpCode.ILSpy
 		}
 		#endregion
 
+		protected override void OnKeyDown(KeyEventArgs e)
+		{
+			base.OnKeyDown(e);
+			if (!e.Handled && e.KeyboardDevice.Modifiers == ModifierKeys.Alt && e.Key == Key.System)
+			{
+				switch (e.SystemKey)
+				{
+					case Key.A:
+						assemblyListComboBox.Focus();
+						e.Handled = true;
+						break;
+					case Key.L:
+						languageComboBox.Focus();
+						e.Handled = true;
+						break;
+					case Key.E: // Alt+V was already taken by _View menu
+						languageVersionComboBox.Focus();
+						e.Handled = true;
+						break;
+				}
+			}
+		}
+
 		public AssemblyList CurrentAssemblyList {
 			get { return assemblyList; }
 		}

ILSpy/Properties/Resources.Designer.cs

@@ -78,6 +78,24 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Analy_zer.
+        /// </summary>
+        public static string _Analyzer {
+            get {
+                return ResourceManager.GetString("_Analyzer", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to _Assemblies.
+        /// </summary>
+        public static string _Assemblies {
+            get {
+                return ResourceManager.GetString("_Assemblies", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to _Check for Updates.
         /// </summary>
@@ -1703,15 +1721,6 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Language.
-        /// </summary>
-        public static string Language {
-            get {
-                return ResourceManager.GetString("Language", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Are you sure that you want to delete the selected assembly list?.
         /// </summary>
@@ -2229,7 +2238,7 @@ namespace ICSharpCode.ILSpy.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select a list of assemblies.
+        ///   Looks up a localized string similar to Select a list of assemblies (Alt+A).
         /// </summary>
         public static string SelectAssemblyListDropdownTooltip {
             get {
@@ -2238,7 +2247,7 @@ namespace ICSharpCode.ILSpy.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select language to decompile to.
+        ///   Looks up a localized string similar to Select language to decompile to (Alt+L).
         /// </summary>
         public static string SelectLanguageDropdownTooltip {
             get {
@@ -2265,7 +2274,7 @@ namespace ICSharpCode.ILSpy.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Select version of language to output.
+        ///   Looks up a localized string similar to Select version of language to output (Alt+E).
         /// </summary>
         public static string SelectVersionDropdownTooltip {
             get {
@@ -2552,6 +2561,15 @@ namespace ICSharpCode.ILSpy.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to UI Language.
+        /// </summary>
+        public static string UILanguage {
+            get {
+                return ResourceManager.GetString("UILanguage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to System.
         /// </summary>

ILSpy/Properties/Resources.resx

@@ -594,9 +594,6 @@ Are you sure you want to continue?</value>
   <data name="InsertUsingDeclarations" xml:space="preserve">
     <value>Insert using declarations</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>Language</value>
-  </data>
   <data name="ListDeleteConfirmation" xml:space="preserve">
     <value>Are you sure that you want to delete the selected assembly list?</value>
   </data>
@@ -772,10 +769,10 @@ Do you want to continue?</value>
     <value>Select assemblies to open:</value>
   </data>
   <data name="SelectAssemblyListDropdownTooltip" xml:space="preserve">
-    <value>Select a list of assemblies</value>
+    <value>Select a list of assemblies (Alt+A)</value>
   </data>
   <data name="SelectLanguageDropdownTooltip" xml:space="preserve">
-    <value>Select language to decompile to</value>
+    <value>Select language to decompile to (Alt+L)</value>
   </data>
   <data name="SelectList" xml:space="preserve">
     <value>Select a list:</value>
@@ -784,7 +781,7 @@ Do you want to continue?</value>
     <value>Select PDB...</value>
   </data>
   <data name="SelectVersionDropdownTooltip" xml:space="preserve">
-    <value>Select version of language to output</value>
+    <value>Select version of language to output (Alt+E)</value>
   </data>
   <data name="SettingsChangeRestartRequired" xml:space="preserve">
     <value>You must restart ILSpy for the change to take effect.</value>
@@ -879,6 +876,9 @@ Do you want to continue?</value>
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="UILanguage" xml:space="preserve">
+    <value>UI Language</value>
+  </data>
   <data name="UILanguage_System" xml:space="preserve">
     <value>System</value>
   </data>
@@ -942,6 +942,12 @@ Do you want to continue?</value>
   <data name="_AddMainList" xml:space="preserve">
     <value>_Add To Main List</value>
   </data>
+  <data name="_Analyzer" xml:space="preserve">
+    <value>Analy_zer</value>
+  </data>
+  <data name="_Assemblies" xml:space="preserve">
+    <value>_Assemblies</value>
+  </data>
   <data name="_CheckUpdates" xml:space="preserve">
     <value>_Check for Updates</value>
   </data>

ILSpy/Properties/Resources.zh-Hans.resx

@@ -585,9 +585,6 @@
   <data name="InsertUsingDeclarations" xml:space="preserve">
     <value>插入使用声明</value>
   </data>
-  <data name="Language" xml:space="preserve">
-    <value>语言</value>
-  </data>
   <data name="ListDeleteConfirmation" xml:space="preserve">
     <value>是否删除选中的程序集列表？</value>
   </data>
@@ -858,6 +855,9 @@
   <data name="Type" xml:space="preserve">
     <value>类型</value>
   </data>
+  <data name="UILanguage" xml:space="preserve">
+    <value>语言</value>
+  </data>
   <data name="UILanguage_System" xml:space="preserve">
     <value>系统</value>
   </data>

ILSpy/Search/SearchPane.cs

@@ -397,7 +397,7 @@ namespace ICSharpCode.ILSpy
 		}
 	}
 
-	[ExportMainMenuCommand(Menu = nameof(Properties.Resources._View), Header = nameof(Properties.Resources.Search), MenuIcon = "Images/Search", MenuCategory = nameof(Properties.Resources.View), MenuOrder = 100)]
+	[ExportMainMenuCommand(Menu = nameof(Properties.Resources._Window), Header = nameof(Properties.Resources.Search), MenuIcon = "Images/Search", MenuCategory = "pane", MenuOrder = 100)]
 	[ExportToolbarCommand(ToolTip = nameof(Properties.Resources.SearchCtrlShiftFOrCtrlE), ToolbarIcon = "Images/Search", ToolbarCategory = nameof(Properties.Resources.View), ToolbarOrder = 100)]
 	sealed class ShowSearchCommand : CommandWrapper
 	{