From d298e0b09925fbba672ed205d34805a68190f27c Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Sun, 5 Jun 2016 22:57:00 +0900
Subject: [PATCH] fix #578 - Sort assemblies by name fix #583 - Sort by Name
 for assemblies

---
 ILSpy/Commands/SortAssemblyListCommand.cs |  39 ++++++++++++++++++++++
 ILSpy/ILSpy.csproj                        |   5 ++-
 ILSpy/Images/Sort.png                     | Bin 0 -> 380 bytes
 ILSpy/SearchPane.cs                       |   2 +-
 4 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 ILSpy/Commands/SortAssemblyListCommand.cs
 create mode 100644 ILSpy/Images/Sort.png

diff --git a/ILSpy/Commands/SortAssemblyListCommand.cs b/ILSpy/Commands/SortAssemblyListCommand.cs
new file mode 100644
index 000000000..2020cf21d
--- /dev/null
+++ b/ILSpy/Commands/SortAssemblyListCommand.cs
@@ -0,0 +1,39 @@
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+
+namespace ICSharpCode.ILSpy
+{
+	[ExportMainMenuCommand(Menu = "_View", Header = "Sort assembly list by name", MenuIcon = "Images/Sort.png", MenuCategory = "View")]
+	[ExportToolbarCommand(ToolTip = "Sort assembly list by name", ToolbarIcon = "Images/Sort.png", ToolbarCategory = "View")]
+	class SortAssemblyListCommand : SimpleCommand, IComparer<LoadedAssembly>
+	{
+		public override void Execute(object parameter)
+		{
+			using (MainWindow.Instance.treeView.LockUpdates())
+				MainWindow.Instance.CurrentAssemblyList.Sort(this);
+		}
+
+		int IComparer<LoadedAssembly>.Compare(LoadedAssembly x, LoadedAssembly y)
+		{
+			return string.Compare(x.ShortName, y.ShortName, StringComparison.CurrentCulture);
+		}
+	}
+}
diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index f2a2334a6..bdd9ed77a 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -108,6 +108,7 @@
     <Compile Include="Commands\ExitCommand.cs" />
     <Compile Include="Commands\CommandWrapper.cs" />
     <Compile Include="Commands\OpenListCommand.cs" />
+    <Compile Include="Commands\SortAssemblyListCommand.cs" />
     <Compile Include="Controls\MarkupExtensions.cs" />
     <Compile Include="Controls\ResourceObjectTable.xaml.cs">
       <DependentUpon>ResourceObjectTable.xaml</DependentUpon>
@@ -406,6 +407,8 @@
     <Resource Include="Images\ResourceXsd.png" />
     <Resource Include="Images\ResourceXslt.png" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\Sort.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
\ No newline at end of file
diff --git a/ILSpy/Images/Sort.png b/ILSpy/Images/Sort.png
new file mode 100644
index 0000000000000000000000000000000000000000..b508e9a49354ef12a8c27ae9a17163c958d6a265
GIT binary patch
literal 380
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb~t%hSa%
z#KJ$>f$iVd@c+&;Ef|G`h09EBi~0X=_mBT7@8aCLfoTp~Lk_zn!=V7hH4Lj6i}~&{
zXWuD*^{!rUx#$1zH@kW+3#?%i*|PpWf05(yCB6yGi;AK>jT!FVR0wZ~VSc)Zfrr^)
zTQkp$J^$Dun2xk1ZeTKLFc#=!jo^*AX#V*Bq^4E>4WwGc&(HMV!|fooz^5(Gy8FKZ
z&(kD^J#h>>8J1L@ef3qM%fXPjOLYRH!u7->R}TI?eqh$b*k&GwwkDIqA9|kt4!qiE
zqGT<bqA-P%{hHjygtH1#S}cqP%az$>%%&fRX%sqOu>9~G{$ftO^$)z4rZBLvF?6ro
VDbQ~)I|mpF44$rjF6*2UngBD?h!y|<

literal 0
HcmV?d00001

diff --git a/ILSpy/SearchPane.cs b/ILSpy/SearchPane.cs
index 7c7fc7a55..20ebec022 100644
--- a/ILSpy/SearchPane.cs
+++ b/ILSpy/SearchPane.cs
@@ -324,7 +324,7 @@ namespace ICSharpCode.ILSpy
 		}
 	}
 
-	[ExportMainMenuCommand(Menu = "_View", Header = "_Search...", MenuIcon = "Images/Find.png", MenuCategory = "ShowPane", MenuOrder = 100)]
+	[ExportMainMenuCommand(Menu = "_View", Header = "_Search...", MenuIcon = "Images/Find.png", MenuCategory = "View", MenuOrder = 100)]
 	[ExportToolbarCommand(ToolTip = "Search (Ctrl+Shift+F or Ctrl+E)", ToolbarIcon = "Images/Find.png", ToolbarCategory = "View", ToolbarOrder = 100)]
 	sealed class ShowSearchCommand : CommandWrapper
 	{