Changeset 207 for trunk/UCore.pas

Timestamp:

May 22, 2018, 9:43:29 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Keep correctly main form dimensions in non-maximized state. Scaling DPI was affecting its size and position.
• Added: Remember last opened tab in New game form.

File:

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

trunk/UCore.pas

@@ -67 +67 @@
     RegistryContext: TRegistryContext;
     GameLoaded: Boolean;
+    FormNewTabIndex: Integer;
     procedure LoadRecentExecute(Sender: TObject);
     procedure StartNewGame;
@@ -75 +76 @@
     procedure GameNewTurnExecute(Sender: TObject);
     procedure AutoSave;
-    procedure LoadConfig;
-    procedure SaveConfig;
     procedure CommandLineParams;
-    procedure ScaleDPI;
     procedure SelectClient;
     procedure LoadGame(FileName: string);
@@ -96 +94 @@
     LocalClients: TClients;
     ServerList: TServerList;
+    procedure LoadConfig;
+    procedure SaveConfig;
     procedure Spectate(Player: TPlayer);
     procedure UpdateActions;
+    procedure ScaleDPI;
     procedure Init;
     procedure Done;
@@ -127 +128 @@
   SPlayersNotInitialized = 'Not all players were initialized with start cell. Needed %d, initialized %d. Change map parameters to have more terrain cells.';
   SFileDialogFilter = 'xTactics games (.xtg)|*.xtg|All files|*.*';
+  SMissingServerClientForPlayer = 'Server client for current player not found.';
 
 
@@ -190 +192 @@
   ScaleDPI1.DPI := Point(XMLConfig1.GetValue('DPIX', 96), XMLConfig1.GetValue('DPIY', 96));
   ScaleDPI1.AutoDetect := XMLConfig1.GetValue('DPIAuto', True);
+  FormNewTabIndex := XMLConfig1.GetValue('FormNewTabIndex', 0);
 end;
 
@@ -203 +206 @@
   XMLConfig1.SetValue('DPIY', ScaleDPI1.DPI.Y);
   XMLConfig1.SetValue('DPIAuto', ScaleDPI1.AutoDetect);
+  XMLConfig1.SetValue('FormNewTabIndex', FormNewTabIndex);
 end;
 
@@ -297 +301 @@
   try
     FormNew.Load(Server);
+    FormNew.PageControl1.TabIndex := FormNewTabIndex;
     if FormNew.ShowModal = mrOk then begin
       FormNew.Save(Server);
@@ -303 +308 @@
       GameLoaded := False;
     end;
+    FormNewTabIndex := FormNew.PageControl1.TabIndex;
   finally
     FormNew.Free;
@@ -488 +494 @@
   ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
   if Assigned(ServerClient) then ServerClient.TurnStart
-    else raise Exception.Create('Server client for current player not found.');
+    else raise Exception.Create(SMissingServerClientForPlayer);
 end;
 
@@ -573 +579 @@
   if Game.Players.GetAliveCount = Game.Players.Count then Game.Running := True
     else ShowMessage(Format(SPlayersNotInitialized, [Game.Players.Count, Game.Players.GetAliveCount]));
+  FormClient.AZoomAll.Execute;
   RedrawClients;
   UpdateOtherForms;
@@ -578 +585 @@
   ServerClient := Server.Clients.SearchByPlayer(Game.CurrentPlayer);
   if Assigned(ServerClient) then ServerClient.TurnStart
-    else raise Exception.Create('Server client for current player not found.');
+    else raise Exception.Create(SMissingServerClientForPlayer);
 end;
 
@@ -616 +623 @@
     GameSettings.Players[1].Name := SPlayer + ' 2';
 
-    LoadConfig;
     GameSettings.LoadConfig(XMLConfig1, 'Game');
     Server.LoadConfig(XMLConfig1, 'Server');
@@ -624 +630 @@
     if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) then
       LoadGame(LastOpenedList1.Items[0]);
-    ScaleDPI;
     FormClientActions;