Changeset 460 for trunk/LocalPlayer/Term.pas

Timestamp:

Nov 28, 2023, 3:16:24 PM (5 months ago)

Author:

chronos

Message:

• Modified: Do not initialize all local player windows at the start of the game but later when they are really opened. This also fixes window initialization under Qt5 widgetset.

File:

• trunk/LocalPlayer/Term.pas (modified) (35 diffs)

trunk/LocalPlayer/Term.pas

@@ -14 +14 @@
   LCLIntf, LCLType, SysUtils, Classes, Graphics, Controls, DrawDlg, Types,
   Forms, Menus, ExtCtrls, dateutils, Platform, ButtonB, ButtonC, EOTButton, Area,
-  GraphicSet, MiniMap, IsoEngine;
+  GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
+  Diagram, CityScreen, Rates, Battle, NatStat, UnitStat, Draft, Select, MessgEx,
+  Help;
 
 const
@@ -324 +326 @@
     NoMap: TIsoMap;
     NoMapPanel: TIsoMap;
+    // Forms
+    FWondersDlg: TWondersDlg;
+    FTechTreeDlg: TTechTreeDlg;
+    FEnhanceDlg: TEnhanceDlg;
+    FNegoDlg: TNegoDlg;
+    FCityTypeDlg: TCityTypeDlg;
+    FDiaDlg: TDiaDlg;
+    FCityDlg: TCityDlg;
+    FRatesDlg: TRatesDlg;
+    FBattleDlg: TBattleDlg;
+    FNatStatDlg: TNatStatDlg;
+    FUnitStatDlg: TUnitStatDlg;
+    FDraftDlg: TDraftDlg;
+    FModalSelectDlg: TModalSelectDlg;
+    FListDlg: TListDlg;
+    FMessgExDlg: TMessgExDlg;
+    FHelpDlg: THelpDlg;
+    procedure ArrangeDialogs;
+    procedure ArrangeDialog(Form: TBufferedDrawDlg);
     function ChooseUnusedTribe: Integer;
     function DoJob(j0: Integer): Integer;
+    function GetBattleDlg: TBattleDlg;
+    function GetCityDlg: TCityDlg;
+    function GetCityTypeDlg: TCityTypeDlg;
+    function GetDiaDlg: TDiaDlg;
+    function GetDraftDlg: TDraftDlg;
+    function GetEnhanceDlg: TEnhanceDlg;
+    function GetHelpDlg: THelpDlg;
+    function GetListDlg: TListDlg;
+    function GetMessgExDlg: TMessgExDlg;
+    function GetModalSelectDlg: TModalSelectDlg;
+    function GetNatStatDlg: TNatStatDlg;
+    function GetNegoDlg: TNegoDlg;
+    function GetRatesDlg: TRatesDlg;
+    function GetTechTreeDlg: TTechTreeDlg;
     procedure GetTribeList;
+    function GetUnitStatDlg: TUnitStatDlg;
+    function GetWondersDlg: TWondersDlg;
     procedure InitModule;
     procedure DoneModule;
@@ -397 +434 @@
     procedure UpdateViews(UpdateCityScreen: Boolean = False);
     function ContactRefused(P: Integer; Item: String): Boolean;
+    // Forms
+    property WondersDlg: TWondersDlg read GetWondersDlg;
+    property TechTreeDlg: TTechTreeDlg read GetTechTreeDlg;
+    property EnhanceDlg: TEnhanceDlg read GetEnhanceDlg;
+    property NegoDlg: TNegoDlg read GetNegoDlg;
+    property CityTypeDlg: TCityTypeDlg read GetCityTypeDlg;
+    property DiaDlg: TDiaDlg read GetDiaDlg;
+    property CityDlg: TCityDlg read GetCityDlg;
+    property RatesDlg: TRatesDlg read GetRatesDlg;
+    property BattleDlg: TBattleDlg read GetBattleDlg;
+    property NatStatDlg: TNatStatDlg read GetNatStatDlg;
+    property UnitStatDlg: TUnitStatDlg read GetUnitStatDlg;
+    property DraftDlg: TDraftDlg read GetDraftDlg;
+    property ModalSelectDlg: TModalSelectDlg read GetModalSelectDlg;
+    property ListDlg: TListDlg read GetListDlg;
+    property MessgExDlg: TMessgExDlg read GetMessgExDlg;
+    property HelpDlg: THelpDlg read GetHelpDlg;
   end;
 
@@ -428 +482 @@
   end;
 
-  TPriceSet = set of $00 .. $FF;
   TFormAction = (faClose, faEnable, faDisable, faUpdate, faSmartUpdateContent);
 
@@ -579 +632 @@
 function InitEnemyModel(emix: Integer): Boolean;
 procedure InitAllEnemyModels;
-procedure InitMyModel(mix: Integer; final: Boolean);
+procedure InitMyModel(Mix: Integer; Final: Boolean);
 
 procedure ImpImage(ca: TCanvas; X, Y, iix: Integer; Government: Integer = -1;
@@ -590 +643 @@
 
 uses
-  Directories, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer, Sound,
-  Battle, Rates, TechTree, Registry, Global, KeyBindings, CmdList;
+  Directories, Log, PixelPointer, Sound, Registry, Global, KeyBindings, CmdList;
 
 {$R *.lfm}
@@ -762 +813 @@
 begin
   if MyMap[Loc] and fDeadLands <> 0 then
-    HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer, 3 * 12)
   else if (MyMap[Loc] and fTerrain = fForest) and IsJungle(Loc div G.lx) then
-    HelpDlg.ShowNewContent(NewMode, hkTer,
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer,
       fJungle + (MyMap[Loc] shr 5 and 3) * 12)
   else
-    HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
+    MainScreen.HelpDlg.ShowNewContent(NewMode, hkTer, MyMap[Loc] and fTerrain +
       (MyMap[Loc] shr 5 and 3) * 12);
 end;
@@ -864 +915 @@
 end;
 
-procedure InitMyModel(mix: Integer; final: Boolean);
+procedure InitMyModel(Mix: Integer; Final: Boolean);
 var
   mi: TModelInfo;
@@ -871 +922 @@
     Exit;
   // don't exit for special units because cSetModelPicture comes after TellNewModels
-  MakeModelInfo(Me, mix, MyModel[mix], mi);
-  ChooseModelPicture(Me, mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
-    False, final);
+  MakeModelInfo(Me, Mix, MyModel[mix], mi);
+  ChooseModelPicture(Me, Mix, ModelCode(mi), ModelHash(mi), MyRO.Turn,
+    False, Final);
 end;
 
@@ -953 +1004 @@
         InitMyModel(MyData.ToldModels, True);
       { only run if no researched model }
-      with MessgExDlg do
+      with MainScreen.MessgExDlg do
       begin
         { MakeModelInfo(me,MyData.ToldModels,MyModel[MyData.ToldModels],mi);
@@ -1157 +1208 @@
     { research complete -- select new }
     repeat
-      ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
-      if ModalSelectDlg.Result < 0 then
+      MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kAdvance);
+      if MainScreen.ModalSelectDlg.Result < 0 then
       begin
         Result := False;
         Exit;
       end;
-      ChosenResearch := ModalSelectDlg.Result;
+      ChosenResearch := MainScreen.ModalSelectDlg.Result;
       if ChosenResearch = adMilitary then
       begin
-        DraftDlg.ShowNewContent(wmModal);
-        if DraftDlg.ModalResult <> mrOK then
+        MainScreen.DraftDlg.ShowNewContent(wmModal);
+        if MainScreen.DraftDlg.ModalResult <> mrOK then
           Tribe[Me].ModelPicture[MyRO.nModel].HGr := nil;
       end;
-    until (ChosenResearch <> adMilitary) or (DraftDlg.ModalResult = mrOK);
+    until (ChosenResearch <> adMilitary) or (MainScreen.DraftDlg.ModalResult = mrOK);
 
     if ChosenResearch = adMilitary then
@@ -1176 +1227 @@
     else if ChosenResearch = adFar then
     begin
-      ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
-      if ModalSelectDlg.Result >= 0 then
-        if (ModalSelectDlg.Result = adNone) or
-          (Server(sSetResearch - sExecute, Me, ModalSelectDlg.Result, nil^) <
+      MainScreen.ModalSelectDlg.ShowNewContent(wmModal, kFarAdvance);
+      if MainScreen.ModalSelectDlg.Result >= 0 then
+        if (MainScreen.ModalSelectDlg.Result = adNone) or
+          (Server(sSetResearch - sExecute, Me, MainScreen.ModalSelectDlg.Result, nil^) <
           rExecuted) then
-          MyData.FarTech := ModalSelectDlg.Result
+          MyData.FarTech := MainScreen.ModalSelectDlg.Result
         else
         begin
-          ChosenResearch := ModalSelectDlg.Result;
+          ChosenResearch := MainScreen.ModalSelectDlg.Result;
           // can be researched immediately
           MyData.FarTech := adNone;
@@ -1194 +1245 @@
   else
     Server(sSetResearch, Me, ChosenResearch, nil^);
-  ListDlg.TechChange;
+  MainScreen.ListDlg.TechChange;
   Result := True;
 end;
@@ -1565 +1616 @@
     until FindNext(SearchRec) <> 0;
   FindClose(SearchRec);
+end;
+
+function TMainScreen.GetUnitStatDlg: TUnitStatDlg;
+begin
+  if not Assigned(FUnitStatDlg) then begin
+    FUnitStatDlg := TUnitStatDlg.Create(nil);
+    ArrangeDialog(FUnitStatDlg);
+    FUnitStatDlg.CheckAge;
+  end;
+  Result := FUnitStatDlg;
+end;
+
+function TMainScreen.GetWondersDlg: TWondersDlg;
+begin
+  if not Assigned(FWondersDlg) then FWondersDlg := TWondersDlg.Create(nil);
+  Result := FWondersDlg;
 end;
 
@@ -1758 +1825 @@
   FreeAndNil(UnusedTribeFiles);
   FreeAndNil(TribeNames);
-  // AdvisorDlg.DeInit;
 end;
 
@@ -1866 +1932 @@
   end;
   InitCityMark(MainTexture);
-  CityDlg.CheckAge;
-  NatStatDlg.CheckAge;
-  UnitStatDlg.CheckAge;
-  HelpDlg.Difficulty := G.Difficulty[Me];
+  if Assigned(FCityDlg) then FCityDlg.CheckAge;
+  if Assigned(FNatStatDlg) then FNatStatDlg.CheckAge;
+  if Assigned(FUnitStatDlg) then FUnitStatDlg.CheckAge;
+  if Assigned(FHelpDlg) then FHelpDlg.Difficulty := G.Difficulty[Me];
 
   UnFocus := -1;
@@ -2521 +2587 @@
 
   HaveStrategyAdvice := False;
-  // (GameMode<>cMovie) and not supervising
-  // and AdvisorDlg.HaveStrategyAdvice;
   GoOnPhase := True;
   if Supervising or (GameMode = cMovie) then
@@ -2628 +2692 @@
       begin
         Server := TInitModuleData(Data).Server;
-        // AdvisorDlg.Init;
         InitModule;
         TInitModuleData(Data).DataSize := SizeOf(TPersistentData);
@@ -2642 +2705 @@
           MainTexture.Age := -1;
         Tribes.Init;
-        HelpDlg.UserLeft := (Screen.width - HelpDlg.width) div 2;
-        HelpDlg.UserTop := (Screen.height - HelpDlg.height) div 2;
+        HelpDlg.UserLeft := (Screen.Width - HelpDlg.Width) div 2;
+        HelpDlg.UserTop := (Screen.Height - HelpDlg.Height) div 2;
         HelpDlg.Difficulty := 0;
         if Command = cStartCredits then
@@ -2654 +2717 @@
     cNewGame, cLoadGame, cMovie, cNewMap:
       begin
-        { if (Command=cNewGame) or (Command=cLoadGame) then
-          AdvisorDlg.NewGame(Data); }
         GenerateNames := mNames.Checked;
         GameOK := True;
@@ -2695 +2756 @@
                 begin
                   CityID := -1;
-                  EffectiveOwner := -1
+                  EffectiveOwner := -1;
                 end;
               FillChar(ToldTech, SizeOf(ToldTech), Byte(tsNA));
@@ -2702 +2763 @@
             end;
 
-        // arrange dialogs
-        ListDlg.UserLeft := 8;
-        ListDlg.UserTop := TopBarHeight + 8;
-        HelpDlg.UserLeft := Screen.width - HelpDlg.width - 8;
-        HelpDlg.UserTop := TopBarHeight + 8;
-        UnitStatDlg.UserLeft := 397;
-        UnitStatDlg.UserTop := TopBarHeight + 64;
-        DiaDlg.UserLeft := (Screen.width - DiaDlg.width) div 2;
-        DiaDlg.UserTop := (Screen.height - DiaDlg.height) div 2;
-        NatStatDlg.UserLeft := Screen.width - NatStatDlg.width - 8;
-        NatStatDlg.UserTop := Screen.height - PanelHeight -
-          NatStatDlg.height - 8;
-        if NatStatDlg.UserTop < 8 then
-          NatStatDlg.UserTop := 8;
+        ArrangeDialogs;
 
         Age := 0;
         MovieSpeed := 1;
         LogDlg.mSlot.Visible := True;
-        LogDlg.Host := self;
-        HelpDlg.ClearHistory;
-        CityDlg.Reset;
+        LogDlg.Host := Self;
+        if Assigned(FHelpDlg) then FHelpDlg.ClearHistory;
+        if Assigned(FCityDlg) then FCityDlg.Reset;
 
         MiniMap.Size := Point(G.lx, G.ly);
@@ -2831 +2879 @@
         Closable := True;
         Close;
-        { if (GameMode=cNewGame) or (GameMode=cLoadGame) then
-          AdvisorDlg.BreakGame; }
       end;
 
@@ -2858 +2904 @@
         begin
           StayOnTop_Ensured := True;
-          CityDlg.StayOnTop_Workaround;
-          CityTypeDlg.StayOnTop_Workaround;
-          DiaDlg.StayOnTop_Workaround;
-          DraftDlg.StayOnTop_Workaround;
-          EnhanceDlg.StayOnTop_Workaround;
-          HelpDlg.StayOnTop_Workaround;
-          NatStatDlg.StayOnTop_Workaround;
-          NegoDlg.StayOnTop_Workaround;
-          ModalSelectDlg.StayOnTop_Workaround;
-          ListDlg.StayOnTop_Workaround;
-          UnitStatDlg.StayOnTop_Workaround;
-          WondersDlg.StayOnTop_Workaround;
-          RatesDlg.StayOnTop_Workaround;
+          //CityDlg.StayOnTop_Workaround;
+          //CityTypeDlg.StayOnTop_Workaround;
+          //DiaDlg.StayOnTop_Workaround;
+          //DraftDlg.StayOnTop_Workaround;
+          //EnhanceDlg.StayOnTop_Workaround;
+          //HelpDlg.StayOnTop_Workaround;
+          //NatStatDlg.StayOnTop_Workaround;
+          //NegoDlg.StayOnTop_Workaround;
+          //ModalSelectDlg.StayOnTop_Workaround;
+          //ListDlg.StayOnTop_Workaround;
+          //UnitStatDlg.StayOnTop_Workaround;
+          //WondersDlg.StayOnTop_Workaround;
+          //RatesDlg.StayOnTop_Workaround;
         end;
       end;
@@ -2934 +2980 @@
             NegoDlg.Visible then
             NegoDlg.Close;
-          skipped := False; // always show my moves during my turn
+          Skipped := False; // always show my moves during my turn
           Idle := True;
           InitTurn(NewPlayer);
@@ -2953 +2999 @@
         pTurn := NewPlayer;
         pLogo := -1;
-        skipped := False; // always show my moves during my turn
+        Skipped := False; // always show my moves during my turn
         Idle := True;
         if FirstMovieTurn then
@@ -2978 +3024 @@
         ClientMode := -1;
         Idle := False;
-        skipped := False;
+        Skipped := False;
       end;
 
@@ -3632 +3678 @@
   I: Integer;
 begin
+  if Assigned(FWondersDlg) then FreeAndNil(FWondersDlg);
+  if Assigned(FTechTreeDlg) then FreeAndNil(FTechTreeDlg);
+  if Assigned(FEnhanceDlg) then FreeAndNil(FEnhanceDlg);
+  if Assigned(FNegoDlg) then FreeAndNil(FNegoDlg);
+  if Assigned(FCityTypeDlg) then FreeAndNil(FCityTypeDlg);
+  if Assigned(FDiaDlg) then FreeAndNil(FDiaDlg);
+  if Assigned(FCityDlg) then FreeAndNil(FCityDlg);
+  if Assigned(FRatesDlg) then FreeAndNil(FRatesDlg);
+  if Assigned(FBattleDlg) then FreeAndNil(FBattleDlg);
+  if Assigned(FNatStatDlg) then FreeAndNil(FNatStatDlg);
+  if Assigned(FUnitStatDlg) then FreeAndNil(FUnitStatDlg);
+  if Assigned(FDraftDlg) then FreeAndNil(FDraftDlg);
+  if Assigned(FModalSelectDlg) then FreeAndNil(FModalSelectDlg);
+  if Assigned(FListDlg) then FreeAndNil(FListDlg);
+  if Assigned(FMessgExDlg) then FreeAndNil(FMessgExDlg);
+  if Assigned(FHelpDlg) then FreeAndNil(FHelpDlg);
+
   MainFormKeyDown := nil;
   FreeAndNil(sb);
@@ -4340 +4403 @@
   end
   else if ClientMode < 0 then
-    skipped := True
+    Skipped := True
   else if ClientMode >= scContact then
     NegoDlg.ShowNewContent(wmPersistent)
@@ -4590 +4653 @@
     ClientMode := -1;
     Idle := False;
-    skipped := WasSkipped;
+    Skipped := WasSkipped;
     for p1 := 1 to nPl - 1 do
       if G.RO[p1] <> nil then
-        skipped := True; // don't show enemy moves in hotseat mode
+        Skipped := True; // don't show enemy moves in hotseat mode
   end
   else
@@ -4604 +4667 @@
     NegoDlg.Close;
   HaveStrategyAdvice := False;
-  // AdvisorDlg.HaveStrategyAdvice;
-  // negotiation might have changed advices
   EOT.ButtonIndex := eotCancel;
   EOT.Visible := True;
@@ -5816 +5877 @@
     Exit;
 
-  if CityDlg.Visible then
+  if Assigned(FCityDlg) and CityDlg.Visible then
     CityDlg.Close;
-  if UnitStatDlg.Visible then
+  if Assigned(FUnitStatDlg) and UnitStatDlg.Visible then
     UnitStatDlg.Close;
   MouseLoc := LocationOfScreenPixel(X, Y);
@@ -7381 +7442 @@
 end;
 
+function TMainScreen.GetBattleDlg: TBattleDlg;
+begin
+  if not Assigned(FBattleDlg) then FBattleDlg := TBattleDlg.Create(nil);
+  Result := FBattleDlg;
+end;
+
+function TMainScreen.GetCityDlg: TCityDlg;
+begin
+  if not Assigned(FCityDlg) then begin
+    FCityDlg := TCityDlg.Create(nil);
+    FCityDlg.CheckAge;
+  end;
+  Result := FCityDlg;
+end;
+
+function TMainScreen.GetCityTypeDlg: TCityTypeDlg;
+begin
+  if not Assigned(FCityTypeDlg) then FCityTypeDlg := TCityTypeDlg.Create(nil);
+  Result := FCityTypeDlg;
+end;
+
+function TMainScreen.GetDiaDlg: TDiaDlg;
+begin
+  if not Assigned(FDiaDlg) then begin
+    FDiaDlg := TDiaDlg.Create(nil);
+    ArrangeDialog(FDiaDlg);
+  end;
+  Result := FDiaDlg;
+end;
+
+function TMainScreen.GetDraftDlg: TDraftDlg;
+begin
+  if not Assigned(FDraftDlg) then FDraftDlg := TDraftDlg.Create(nil);
+  Result := FDraftDlg;
+end;
+
+function TMainScreen.GetEnhanceDlg: TEnhanceDlg;
+begin
+  if not Assigned(FEnhanceDlg) then FEnhanceDlg := TEnhanceDlg.Create(nil);
+  Result := FEnhanceDlg;
+end;
+
+function TMainScreen.GetHelpDlg: THelpDlg;
+begin
+  if not Assigned(FHelpDlg) then begin
+    FHelpDlg := THelpDlg.Create(nil);
+    ArrangeDialog(FHelpDlg);
+    FHelpDlg.Difficulty := G.Difficulty[Me];
+  end;
+  Result := FHelpDlg;
+end;
+
+function TMainScreen.GetListDlg: TListDlg;
+begin
+  if not Assigned(FListDlg) then begin
+    FListDlg := TListDlg.Create(nil);
+    ArrangeDialog(FListDlg);
+  end;
+  Result := FListDlg;
+end;
+
+function TMainScreen.GetMessgExDlg: TMessgExDlg;
+begin
+  if not Assigned(FMessgExDlg) then FMessgExDlg := TMessgExDlg.Create(nil);
+    Result := FMessgExDlg;
+end;
+
+function TMainScreen.GetModalSelectDlg: TModalSelectDlg;
+begin
+  if not Assigned(FModalSelectDlg) then FModalSelectDlg := TModalSelectDlg.Create(nil);
+  Result := FModalSelectDlg;
+end;
+
+function TMainScreen.GetNatStatDlg: TNatStatDlg;
+begin
+  if not Assigned(FNatStatDlg) then begin
+    FNatStatDlg := TNatStatDlg.Create(nil);
+    ArrangeDialog(FNatStatDlg);
+    FNatStatDlg.CheckAge;
+  end;
+  Result := FNatStatDlg;
+end;
+
+function TMainScreen.GetNegoDlg: TNegoDlg;
+begin
+  if not Assigned(FNegoDlg) then FNegoDlg := TNegoDlg.Create(nil);
+  Result := FNegoDlg;
+end;
+
+function TMainScreen.GetRatesDlg: TRatesDlg;
+begin
+  if not Assigned(FRatesDlg) then FRatesDlg := TRatesDlg.Create(nil);
+  Result := FRatesDlg;
+end;
+
+function TMainScreen.GetTechTreeDlg: TTechTreeDlg;
+begin
+  if not Assigned(FTechTreeDlg) then FTechTreeDlg := TTechTreeDlg.Create(nil);
+  Result := FTechTreeDlg;
+end;
+
 procedure TMainScreen.mDisbandOrUtilizeClick(Sender: TObject);
 var
@@ -8177 +8339 @@
 end;
 
-{ procedure TMainScreen.AdviceBtnClick;
-  var
-  OldAdviceLoc: Integer;
-  begin
-  DestinationMarkON:=False;
-  PaintDestination;
-  AdvisorDlg.GiveStrategyAdvice;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=-1;
-  PaintLoc(OldAdviceLoc);
-  end; }
-
-{ procedure TMainScreen.SetAdviceLoc(Loc: integer; AvoidRect: TRect);
-  var
-  OldAdviceLoc,X,Y: Integer;
-  begin
-  if Loc<>MainMap.AdviceLoc then
-  begin
-  if Loc>=0 then
-  begin // center
-  Y:=Loc div G.lx;
-  X:=(Loc+G.lx - AvoidRect.Right div (2*66)) mod G.lx;
-  Centre(Y*G.lx+X);
-  PaintAllMaps;
-  end;
-  OldAdviceLoc:=MainMap.AdviceLoc;
-  MainMap.AdviceLoc:=Loc;
-  PaintLoc(OldAdviceLoc);
-  PaintLoc(MainMap.AdviceLoc);
-  end;
-  end; }
-
 procedure TMainScreen.UnitInfoBtnClick(Sender: TObject);
 begin
@@ -8294 +8424 @@
 end;
 
+procedure TMainScreen.ArrangeDialogs;
+begin
+  ArrangeDialog(FListDlg);
+  ArrangeDialog(FHelpDlg);
+  ArrangeDialog(FUnitStatDlg);
+  ArrangeDialog(FDiaDlg);
+  ArrangeDialog(FNatStatDlg);
+end;
+
+procedure TMainScreen.ArrangeDialog(Form: TBufferedDrawDlg);
+begin
+  if not Assigned(Form) then Exit;
+
+  if Form is TListDlg then begin;
+    ListDlg.UserLeft := 8;
+    ListDlg.UserTop := TopBarHeight + 8;
+  end;
+  if Form is THelpDlg then begin
+   HelpDlg.UserLeft := Screen.Width - HelpDlg.Width - 8;
+    HelpDlg.UserTop := TopBarHeight + 8;
+  end;
+  if Form is TUnitStatDlg then begin
+    UnitStatDlg.UserLeft := 397;
+    UnitStatDlg.UserTop := TopBarHeight + 64;
+  end;
+  if Form is TDiaDlg then begin
+    DiaDlg.UserLeft := (Screen.Width - DiaDlg.Width) div 2;
+    DiaDlg.UserTop := (Screen.Height - DiaDlg.Height) div 2;
+  end;
+  if Form is TNatStatDlg then begin
+    NatStatDlg.UserLeft := Screen.Width - NatStatDlg.Width - 8;
+    NatStatDlg.UserTop := Screen.Height - PanelHeight - NatStatDlg.Height - 8;
+    if NatStatDlg.UserTop < 8 then
+      NatStatDlg.UserTop := 8;
+  end;
+end;
+
 procedure TMainScreen.ScrollBarUpdate(Sender: TObject);
 begin