Changeset 465 for branches/highdpi/LocalPlayer/KeyBindings.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (12 months ago)

Author:

chronos

Message:

• Modified: Updated high dpi branch from trunk.
• Modified: Use generics.collections instead of fgl.
• Modified: Compile with Delphi syntax.

File:

• branches/highdpi/LocalPlayer/KeyBindings.pas (moved) (moved from branches/highdpi/LocalPlayer/UKeyBindings.pas ) (7 diffs)

branches/highdpi/LocalPlayer/KeyBindings.pas

@@ -1 @@
-unit UKeyBindings;
-
-{$mode delphi}
+unit KeyBindings;
 
 interface
 
 uses
-  Classes, SysUtils, fgl, LCLProc, LCLType, Menus, Registry;
+  Classes, SysUtils, Generics.Collections, Generics.Defaults, LCLProc, LCLType,
+  Menus, Registry;
 
 type
@@ -26 +25 @@
   { TKeyBindings }
 
-  TKeyBindings = class(TFPGObjectList<TKeyBinding>)
+  TKeyBindings = class(TObjectList<TKeyBinding>)
   private
   public
@@ -38 +37 @@
     procedure ResetToDefault;
     procedure RemoveShortCut(ShortCut: TShortCut);
+    procedure SortAlpha;
   end;
 
@@ -241 +241 @@
   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 +289 @@
     if Items[I].ShortCut2 = ShortCut then Items[I].ShortCut2 := 0;
   end;
+end;
+
+function CompareAlpha(constref Item1, Item2: TKeyBinding): Integer;
+begin
+  Result := CompareStr(Item1.FullName, Item2.FullName);
+end;
+
+procedure TKeyBindings.SortAlpha;
+begin
+  Sort(TComparer<TKeyBinding>.Construct(CompareAlpha));
 end;
 
@@ -372 +387 @@
   BMoveLeftUp := AddItem('MoveLeftUp', 'Move unit left-up', 'Num7', 'Home');
   BMoveLeft := AddItem('MoveLeft', 'Move unit left', 'Num4', 'Left');
+  SortAlpha;
 end;
 
@@ -381 +397 @@
 end.
 
+