More sorting in entity lists

Author: alexvins

editor_classes.pas

@@ -115,6 +115,7 @@   TNamedCollectionItemClass = class of TNamedCollectionItem;
   THashedCollection = class(TCollection)
   private
     FHash: TFPHashObjectList;
+
   protected
     procedure ItemIdentifierChanged(Item: TCollectionItem; AOldName: String; ANewName: String); virtual;
     procedure ItemAdded(Item: TCollectionItem); virtual;
@@ -132,6 +133,8 @@   THashedCollection = class(TCollection)
     procedure Remove(AIdentifier: String);
 
     function FindItem(const AName: String): TNamedCollectionItem;
+
+    procedure SortByDisplayName;
   end;
 
 
@@ -564,6 +567,16 @@ function THashedCollection.FindItem(const AName: String): TNamedCollectionItem;
     Result := TNamedCollectionItem(Items[idx]);
 end;
 
+function CompareByDisplayName(Item1, Item2: TCollectionItem): Integer;
+begin
+  Result := CompareStr(Item1.DisplayName,Item2.DisplayName);
+end;
+
+procedure THashedCollection.SortByDisplayName;
+begin
+  Sort(@CompareByDisplayName);
+end;
+
 { TNamedCollectionItem }
 
 procedure TNamedCollectionItem.SetIdentifier(AValue: AnsiString);

forms/gui_helpers.pas

@@ -108,7 +108,6 @@ function filter_stub(ATarget: TBaseInfo): Boolean;
   Result := True;
 end;
 
-
 function FillItems(ATarget: TStrings; AFullList: TStrings; ASelected: AnsiString): integer;
 var
   i: Integer;
@@ -122,7 +121,7 @@ function FillItems(ATarget: TStrings; AFullList: TStrings; ASelected: AnsiString
     info := AFullList.Objects[i] as TBaseInfo;
     if info.IsValid then
     begin
-      ATarget.AddObject(info.Name+'('+info.Identifier+')',info);
+      ATarget.AddObject(info.Name,info);
       if(ASelected <>'') and (info.Identifier = ASelected) then
       begin
         Result := ATarget.Count - 1;

lists_manager.pas

@@ -550,7 +550,7 @@       TResolveRequest = record
     FCreatureInfos: TCreatureInfos;
     FHeroInfos: THeroInfos;
     FArtifactInfos: TArtifactInfos;
-    FArtifactSlotMaps: array[0..ARTIFACT_SLOT_COUNT-1] of TStrings;
+    FArtifactSlotMaps: array[0..ARTIFACT_SLOT_COUNT-1] of TStringList;
     FSlotIds: TSlotMap;
 
     FResolveRequests: TResolveRequests;
@@ -1368,7 +1368,9 @@ constructor TListsManager.Create(AOwner: TComponent);
 
   for i in [0..ARTIFACT_SLOT_COUNT-1] do
   begin
-    FArtifactSlotMaps[i] := CrStrList;
+    FArtifactSlotMaps[i] := TStringList.Create;
+    FArtifactSlotMaps[i].Sorted:=false;
+    FArtifactSlotMaps[i].Duplicates:=dupAccept;
   end;
 
   FHeroInfos := THeroInfos.Create(self);
@@ -2076,6 +2078,7 @@ procedure TListsManager.Load(AProgess: IProgressCallback; APaths: TModdedConfigP
 
     FDestreamer.JSONToObjectEx(FCombinedConfig, ATarget);
 
+    ATarget.SortByDisplayName;
   finally
     FCombinedConfig.Free;
     FConfig.Free;

vcmieditor.lpi

@@ -29,7 +29,7 @@
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="1"/>
       <RevisionNr Value="14"/>
-      <BuildNr Value="143"/>
+      <BuildNr Value="144"/>
       <Attributes pvaPreRelease="True"/>
       <StringTable OriginalFilename="vcmieditor.exe" ProductName="VCMI" ProductVersion="0.99"/>
     </VersionInfo>