Changeset 418

Timestamp:

Nov 17, 2021, 11:31:18 AM (3 years ago)

Author:

chronos

Message:

• Modified: Sort key bindings alphabetically in the settings dialog.
• Modified: Use update locking for filling a list of languages and key bindings.

Location:

trunk

Files:

• LocalPlayer/UKeyBindings.pas (modified) (4 diffs)
• Packages/Common/UTranslator.pas (modified) (2 diffs)

trunk/LocalPlayer/UKeyBindings.pas

@@ -38 +38 @@
     procedure ResetToDefault;
     procedure RemoveShortCut(ShortCut: TShortCut);
+    procedure SortAlpha;
   end;
 
@@ -241 +242 @@
   Text: string;
 begin
-  Strings.Clear;
-  for I := 0 to Count - 1 do begin
-    Text:= '';
-    if Items[I].ShortCut <> 0 then
-      Text:= Text + ShortCutToText(Items[I].ShortCut);
-    if Items[I].ShortCut2 <> 0 then begin
-      if Text <> '' then Text := Text + ', ';
-      Text:= Text + ShortCutToText(Items[I].ShortCut2);
+  Strings.BeginUpdate;
+  try
+    Strings.Clear;
+    for I := 0 to Count - 1 do begin
+      Text := '';
+      if Items[I].ShortCut <> 0 then
+        Text := Text + ShortCutToText(Items[I].ShortCut);
+      if Items[I].ShortCut2 <> 0 then begin
+        if Text <> '' then Text := Text + ', ';
+        Text := Text + ShortCutToText(Items[I].ShortCut2);
+      end;
+      if Text <> '' then Text := Items[I].FullName + ' (' + Text + ')'
+        else Text := Items[I].FullName;
+      Strings.Add(Text);
     end;
-    if Text <> '' then Text := Items[I].FullName + ' (' + Text + ')'
-      else Text := Items[I].FullName;
-    Strings.Add(Text);
+  finally
+    Strings.EndUpdate;
   end;
 end;
@@ -284 +290 @@
     if Items[I].ShortCut2 = ShortCut then Items[I].ShortCut2 := 0;
   end;
+end;
+
+function CompareAlpha(const Item1, Item2: TKeyBinding): Integer;
+begin
+  Result := CompareStr(Item1.FullName, Item2.FullName);
+end;
+
+procedure TKeyBindings.SortAlpha;
+begin
+  Sort(CompareAlpha);
 end;
 
@@ -372 +388 @@
   BMoveLeftUp := AddItem('MoveLeftUp', 'Move unit left-up', 'Num7', 'Home');
   BMoveLeft := AddItem('MoveLeft', 'Move unit left', 'Num4', 'Left');
+  SortAlpha;
 end;
 

trunk/Packages/Common/UTranslator.pas

@@ -316 +316 @@
 begin
   with Strings do begin
-    Clear;
-    for I := 0 to Languages.Count - 1 do
-    with TLanguage(Languages[I]) do
-      if Available then begin
-        ItemName := Name;
-        if WithCode and (Code <> '') then ItemName := ItemName + ' (' + Code + ')';
-        AddObject(ItemName, Languages[I]);
-      end;
+    BeginUpdate;
+    try
+      Clear;
+      for I := 0 to Languages.Count - 1 do
+      with Languages[I] do
+        if Available then begin
+          ItemName := Name;
+          if WithCode and (Code <> '') then ItemName := ItemName + ' (' + Code + ')';
+          AddObject(ItemName, Languages[I]);
+        end;
+    finally
+      EndUpdate;
+    end;
   end;
 end;
@@ -375 +380 @@
 
   for I := 1 to Languages.Count - 1 do
-  with TLanguage(Languages[I]) do begin
+  with Languages[I] do begin
     Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
       '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');