Changeset 206 for trunk/UCore.pas

Timestamp:

May 21, 2018, 2:50:02 PM (6 years ago)

Author:

chronos

Message:

• Added: New window to list all available actions with their keyboard shortcuts.
• Fixed: Keyboard shortcuts didn't worked for FormClient docked into FormMain.
• Fixed: Signal a turn start to first player if a game is loaded from a file.

File:

• trunk/UCore.pas (modified) (12 diffs)

trunk/UCore.pas

@@ -17 +17 @@
   TCore = class(TDataModule)
     AAbout: TAction;
+    AShowKeyShortcuts: TAction;
     AGameSave: TAction;
     APlayersStats: TAction;
@@ -27 +28 @@
     ApplicationInfo: TApplicationInfo;
     ASettings: TAction;
-    ActionList1: TActionList;
+    ActionListMain: TActionList;
     AExit: TAction;
     AGameEnd: TAction;
@@ -55 +56 @@
     procedure ASettingsExecute(Sender: TObject);
     procedure AShowChartsExecute(Sender: TObject);
+    procedure AShowKeyShortcutsExecute(Sender: TObject);
     procedure AShowUnitMovesExecute(Sender: TObject);
     procedure CoolTranslator1Translate(Sender: TObject);
@@ -81 +83 @@
     procedure RedrawClients;
     procedure UpdateOtherForms;
+    procedure FormClientActions;
   public
     Game: TGame;
@@ -109 +112 @@
 
 uses
-  UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI,
+  UFormMain, UFormNew, UFormSettings, UFormAbout, UClientAI, UFormKeyShortcuts,
   UFormHelp, UFormCharts, UFormUnitMoves, UFormPlayersStats;
 
@@ -373 +376 @@
 end;
 
+procedure TCore.AShowKeyShortcutsExecute(Sender: TObject);
+begin
+  if not Assigned(FormKeyShortcuts) then FormKeyShortcuts := TFormKeyShortcuts.Create(nil);
+  FormKeyShortcuts.Show;
+end;
+
 procedure TCore.AShowUnitMovesExecute(Sender: TObject);
 begin
@@ -382 +391 @@
 begin
   UGame.InitStrings;
+  CoolTranslator1.TranslateComponentRecursive(FormClient);
 end;
 
@@ -409 +419 @@
   if Assigned(FormUnitMoves) then FreeAndNil(FormUnitMoves);
   if Assigned(FormCharts) then FreeAndNil(FormCharts);
+  if Assigned(FormKeyShortcuts) then FreeAndNil(FormKeyShortcuts);
   FreeAndNil(FormClients);
   FreeAndNil(StoredDimension);
@@ -431 +442 @@
   Player: TPlayer;
   NewClient: TClient;
+  ServerClient: TServerClient;
 begin
   GameLoaded := True;
@@ -473 +485 @@
   RedrawClients;
   UpdateOtherForms;
+  UpdateActions;
+  ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
+  if Assigned(ServerClient) then ServerClient.TurnStart
+    else raise Exception.Create('Server client for current player not found.');
 end;
 
@@ -489 +505 @@
   if Assigned(FormUnitMoves) and FormUnitMoves.Visible then FormUnitMoves.ReloadList;
   if Assigned(FormPlayersStats) and FormPlayersStats.Visible then FormPlayersStats.ReloadList;
+end;
+
+procedure TCore.FormClientActions;
+var
+  Action: TAction;
+  I: Integer;
+begin
+  for I := 0 to FormClient.ActionList1.ActionCount - 1 do begin
+    Action := TAction.Create(FormMain);
+    Action.Assign(TAction(FormClient.ActionList1.Actions[I]));
+    Action.ActionList := FormMain.ActionList1;
+  end;
 end;
 
@@ -597 +625 @@
       LoadGame(LastOpenedList1.Items[0]);
     ScaleDPI;
+    FormClientActions;
 
     if Game.FileName = '' then StartNewGame;