Changeset 465 for branches/highdpi/Log.pas

Timestamp:

Nov 30, 2023, 10:16:14 PM (6 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/Log.pas (modified) (6 diffs)

branches/highdpi/Log.pas

@@ -5 +5 @@
 
 uses
-  UDpiControls, LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  UDpiControls, LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   StdCtrls, Menus;
 
@@ -27 +27 @@
     procedure mClearClick(Sender: TObject);
     procedure mSlotClick(Sender: TObject);
-    procedure FormKeyDown(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure Toggle(Sender: TObject);
     procedure ListMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
-    procedure FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
   public
     Host: TDpiForm;
-    procedure Add(Level, Turn: Integer; Text: pchar);
+    procedure Add(Level, Turn: Integer; Text: PChar);
   private
     MaxLevel: Integer;
@@ -61 +61 @@
 begin
   MaxLevel := TDpiMenuItem(Sender).Tag;
-  TDpiMenuItem(Sender).Checked := true;
+  TDpiMenuItem(Sender).Checked := True;
 end;
 
-procedure TLogDlg.Add(Level, Turn: Integer; Text: pchar);
+procedure TLogDlg.Add(Level, Turn: Integer; Text: PChar);
 begin
   if (MaxLevel > 0) and (Level <= MaxLevel) or (Level = 1 shl 16 + 1) and
@@ -89 +89 @@
 var
   X, Y: Integer;
-  s: string;
+  S: string;
 begin
   for Y := 0 to 2 do
   begin
-    s := '| ';
+    S := '| ';
     for X := 0 to 2 do
       if G.Difficulty[SlotNo[Y, X]] = 0 then
-        s := s + 'SUP |'
+        S := S + 'SUP |'
       else if G.Difficulty[SlotNo[Y, X]] < 0 then
-        s := s + '--- |'
+        S := S + '--- |'
       else
       begin
@@ -104 +104 @@
         begin // check multi control
           if G.Difficulty[SlotNo[Y, X] + 3] >= 0 then
-            s := s + Tribe[SlotNo[Y, X] + 3].TPhrase('SHORTNAME') + '+';
+            S := S + Tribe[SlotNo[Y, X] + 3].TPhrase('SHORTNAME') + '+';
           if G.Difficulty[SlotNo[Y, X] + 6] >= 0 then
-            s := s + Tribe[SlotNo[Y, X] + 6].TPhrase('SHORTNAME') + '+';
+            S := S + Tribe[SlotNo[Y, X] + 6].TPhrase('SHORTNAME') + '+';
         end;
-        s := s + Tribe[SlotNo[Y, X]].TPhrase('SHORTNAME') + ' | ';
+        S := S + Tribe[SlotNo[Y, X]].TPhrase('SHORTNAME') + ' | ';
       end;
-    List.Lines.Add(s)
+    List.Lines.Add(S);
   end;
   PostMessage(List.Handle, WM_VSCROLL, SB_BOTTOM, 0);
 end;
 
-procedure TLogDlg.FormKeyDown(Sender: TObject; var Key: word;
+procedure TLogDlg.FormKeyDown(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -134 +134 @@
 end;
 
-procedure TLogDlg.FormKeyUp(Sender: TObject; var Key: word; Shift: TShiftState);
+procedure TLogDlg.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 begin
   if Host <> nil then