Fix #1316: Resources string table is not sorted by name anymore since 3.1

ILSpy/Controls/GridViewColumnAutoSize.cs

@@ -70,7 +70,8 @@ namespace ICSharpCode.ILSpy.Controls
 		{
 			string[] sizes = (sizeValue ?? "").Split(';');
 			
-			Debug.Assert(sizes.Length == view.Columns.Count);
+			if (sizes.Length != view.Columns.Count)
+				return;
 			Dictionary<int, Func<double, double>> percentages = new Dictionary<int, Func<double, double>>();
 			double remainingWidth = fullWidth - 30; // 30 is a good offset for the scrollbar
 			

ILSpy/Controls/ResourceObjectTable.xaml

@@ -2,6 +2,7 @@
 <UserControl x:Class="ICSharpCode.ILSpy.Controls.ResourceObjectTable"
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:local="clr-namespace:ICSharpCode.ILSpy.Controls"
 			 Cursor="Arrow">
 	<UserControl.CommandBindings>
 		<CommandBinding Command="ApplicationCommands.Copy"
@@ -36,25 +37,26 @@
 				  Foreground="Black"
 				  Grid.Row="1"
 				  AlternationCount="2"
-				  ItemContainerStyle="{StaticResource alternatingWithBinding}">
+				  ItemContainerStyle="{StaticResource alternatingWithBinding}"
+				  local:SortableGridViewColumn.SortMode="Automatic">
 			<ListView.View>
 				<GridView AllowsColumnReorder="False">
 					<GridView.Columns>
-						<GridViewColumn DisplayMemberBinding="{Binding Key}">
+						<local:SortableGridViewColumn DisplayMemberBinding="{Binding Key}" SortBy="Key">
 							<GridViewColumnHeader Content="Name"
 												  HorizontalContentAlignment="Left"
 												  FontWeight="Bold" />
-						</GridViewColumn>
+						</local:SortableGridViewColumn>
-						<GridViewColumn DisplayMemberBinding="{Binding Value}">
+						<local:SortableGridViewColumn DisplayMemberBinding="{Binding Value}" SortBy="Value">
 							<GridViewColumnHeader Content="Value (as string)"
 												  HorizontalContentAlignment="Left"
 												  FontWeight="Bold" />
-						</GridViewColumn>
+						</local:SortableGridViewColumn>
-						<GridViewColumn DisplayMemberBinding="{Binding Type}">
+						<local:SortableGridViewColumn DisplayMemberBinding="{Binding Type}" SortBy="Type">
 							<GridViewColumnHeader Content="Type"
 												  HorizontalContentAlignment="Left"
 												  FontWeight="Bold" />
-						</GridViewColumn>
+						</local:SortableGridViewColumn>
 					</GridView.Columns>
 				</GridView>
 			</ListView.View>

ILSpy/Controls/ResourceStringTable.xaml

@@ -2,6 +2,7 @@
 <UserControl x:Class="ICSharpCode.ILSpy.Controls.ResourceStringTable"
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:local="clr-namespace:ICSharpCode.ILSpy.Controls"
 			 Cursor="Arrow">
 	<UserControl.CommandBindings>
 		<CommandBinding Command="ApplicationCommands.Copy"
@@ -34,22 +35,23 @@
 			  FontFamily="Segoe UI"
 			  FontSize="9pt"
 			  Foreground="Black"
-				  Grid.Row="1"
+			  Grid.Row="1"
-				  AlternationCount="2"
+			  AlternationCount="2"
-				  ItemContainerStyle="{StaticResource alternatingWithBinding}">
+			  ItemContainerStyle="{StaticResource alternatingWithBinding}"
+			  local:SortableGridViewColumn.SortMode="Automatic">
 		<ListView.View>
 			<GridView AllowsColumnReorder="False">
 				<GridView.Columns>
-					<GridViewColumn DisplayMemberBinding="{Binding Key}">
+					<local:SortableGridViewColumn DisplayMemberBinding="{Binding Key}" SortBy="Key">
 						<GridViewColumnHeader Content="Name"
 											  HorizontalContentAlignment="Left"
 											  FontWeight="Bold" />
-					</GridViewColumn>
+					</local:SortableGridViewColumn>
-					<GridViewColumn DisplayMemberBinding="{Binding Value}">
+						<local:SortableGridViewColumn DisplayMemberBinding="{Binding Value}" SortBy="Value">
 						<GridViewColumnHeader Content="Value"
 											  HorizontalContentAlignment="Left"
 											  FontWeight="Bold" />
-					</GridViewColumn>
+					</local:SortableGridViewColumn>
 				</GridView.Columns>
 			</GridView>
 		</ListView.View>