Changeset 207 for trunk

Timestamp:

May 22, 2018, 9:43:29 AM (7 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.

Location:

trunk

Files:

• Forms/UFormClient.pas (modified) (3 diffs)
• Forms/UFormMain.pas (modified) (2 diffs)
• Forms/UFormNew.pas (modified) (1 diff)
• Languages/xtactics.cs.po (modified) (1 diff)
• Languages/xtactics.po (modified) (1 diff)
• Packages/Common/UPersistentForm.pas (modified) (4 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (13 diffs)

trunk/Forms/UFormClient.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
   UGame, LCLType, Menus, ActnList, ComCtrls, dateutils, XMLConf, DOM, UCommPin,
-  UGeometry, UGameClient, UGameProtocol;
+  UGeometry, UGameClient, UGameProtocol, UThreading;
 
 const
@@ -231 +231 @@
     FClient.OnTurnStart := DoTurnStart;
     FClient.OnDestroy := DoClientDestroy;
+    FClient.View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
   end;
   Redraw;
@@ -243 +244 @@
 begin
   TurnActive := True;
-  UpdateInterface;
+  Synchronize(UpdateInterface);
 end;
 

trunk/Forms/UFormMain.pas

@@ -149 +149 @@
   FormClient.ManualDock(PanelMain, nil, alClient);
   FormClient.Align := alClient;
-  FormClient.Show;
 end;
 
@@ -179 +178 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
+  Core.LoadConfig;
+  Core.ScaleDPI;
+  Core.PersistentForm.Load(Self, True);
   Core.Init;
   LoadConfig(Core.XMLConfig1, 'FormMain');
-  Core.PersistentForm.Load(Self, True);
   ReloadView;
+  FormClient.Show;
 end;
 

trunk/Forms/UFormNew.pas

@@ -342 +342 @@
   ReloadView;
   //Height := Trunc(1.5 * Height);
-  PageControl1.TabIndex := 0;
+  //PageControl1.TabIndex := 0;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -740 +740 @@
 msgid "xTactics games (.xtg)|*.xtg|All files|*.*"
 msgstr "xTactics hry (.xtg)|*.xtg|Všechny soubory|*.*"
+
+#: ucore.smissingserverclientforplayer
+msgid "Server client for current player not found."
+msgstr "Chybí klient serveru pro aktuálního hráče"
 
 #: ucore.splayersnotinitialized

trunk/Languages/xtactics.po

@@ -724 +724 @@
 #: ucore.sfiledialogfilter
 msgid "xTactics games (.xtg)|*.xtg|All files|*.*"
+msgstr ""
+
+#: ucore.smissingserverclientforplayer
+msgid "Server client for current player not found."
 msgstr ""
 

trunk/Packages/Common/UPersistentForm.pas

@@ -19 +19 @@
     FMinVisiblePart: Integer;
     FRegistryContext: TRegistryContext;
+    FirstLoad: Boolean;
     procedure LoadControl(Control: TControl);
     procedure SaveControl(Control: TControl);
@@ -119 +120 @@
     RootKey := RegistryContext.RootKey;
     OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    FirstLoad := not ValueExists('WindowState');
     // Normal size
     FormNormalSize.Left := ReadIntegerWithDefault('NormalLeft', FormNormalSize.Left);
@@ -227 +229 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    DefaultMaximized then begin
+    (DefaultMaximized and FirstLoad) then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;
@@ -263 +265 @@
   FMinVisiblePart := 50;
   FRegistryContext.RootKey := HKEY_CURRENT_USER;
+  FirstLoad := False;
 end;
 

trunk/UCore.lfm

@@ -4 +4 @@
   OldCreateOrder = False
   Height = 676
-  HorizontalOffset = 275
-  VerticalOffset = 190
+  HorizontalOffset = 262
+  VerticalOffset = 203
   Width = 1048
   PPI = 120

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;