Changeset 194

Timestamp:

May 7, 2020, 8:39:24 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Locale configuration in configuration was not working as expected. ModalResult of Ok and Cancel buttons was opposite. Selected locale was not applied during application startup.
• Fixed: Updating fullscreen mode after changeing mode in configuration window.

Location:

trunk

Files:

• Back.pas (modified) (3 diffs)
• Locale.pas (modified) (2 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (6 diffs)
• Start.pas (modified) (6 diffs)

trunk/Back.pas

@@ -19 +19 @@
   private
     Img: TBitmap;
+  public
+    procedure UpdateInterface;
   end;
 
@@ -37 +39 @@
 
 procedure TBackground.FormShow(Sender: TObject);
-var
-  FileName: string;
 begin
-  if FullScreen then begin
-    if not Assigned(Img) then begin
-      FileName := GetGraphicsDir + DirectorySeparator + 'Background.png';
-      if FileExists(FileName) then begin
-        Img := TBitmap.Create;
-        LoadGraphicFile(img, FileName);
-      end;
-    end;
-  end else begin
-    WindowState := wsNormal;
-    Width := StartDlg.Width + 16;
-    Height := StartDlg.Height + 16;
-    Left := StartDlg.Left - 8;
-    Top := StartDlg.Top - 8;
-  end;
+  UpdateInterface;
 end;
 
@@ -74 +60 @@
 end;
 
+procedure TBackground.UpdateInterface;
+var
+  FileName: string;
+begin
+  if FullScreen then begin
+    WindowState := wsMaximized;
+    if not Assigned(Img) then begin
+      FileName := GetGraphicsDir + DirectorySeparator + 'Background.png';
+      if FileExists(FileName) then begin
+        Img := TBitmap.Create;
+        LoadGraphicFile(img, FileName);
+      end;
+    end;
+  end else begin
+    WindowState := wsNormal;
+    Width := StartDlg.Width + 16;
+    Height := StartDlg.Height + 16;
+    Left := StartDlg.Left - 8;
+    Top := StartDlg.Top - 8;
+  end;
+end;
+
 end.

trunk/Locale.pas

@@ -111 +111 @@
 procedure TLocaleDlg.CancelBtnClick(Sender: TObject);
 begin
-  ModalResult := mrOk;
+  ModalResult := mrCancel;
 end;
 
@@ -161 +161 @@
 begin
   LocaleCode := Languages[List.ItemIndex].ShortName;
-  ModalResult := mrCancel;
+  ModalResult := mrOk;
 end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -199 +199 @@
   Gamma: Integer; // global gamma correction (cent)
 
+procedure LoadAssets;
 procedure UnitInit;
 procedure UnitDone;
@@ -1486 +1487 @@
   P: integer;
 begin
-  for Section := Low(TFontType) to High(TFontType) do
-    UniFont[Section] := TFont.Create;
-
   Section := ftNormal;
   AssignFile(FontScript, LocalizedFilePath('Fonts.txt'));
   try
-    Reset(fontscript);
-    while not EOF(FontScript) do begin
+    Reset(FontScript);
+    while not Eof(FontScript) do begin
       ReadLn(FontScript, s);
       if s <> '' then
@@ -1549 +1547 @@
 end;
 
+procedure LoadAssets;
+begin
+  LoadPhrases;
+  LoadFonts;
+  LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
+    'Templates.png', gfNoGamma);
+  LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
+  LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
+  LoadGraphicFile(BigImp, GetGraphicsDir + DirectorySeparator + 'Icons.png');
+end;
+
 procedure UnitInit;
+var
+  Section: TFontType;
 begin
   Gamma := 100;
@@ -1559 +1570 @@
   {$ENDIF}
 
-  LoadPhrases;
-
   LogoBuffer := TBitmap.Create;
   LogoBuffer.PixelFormat := pf24bit;
   LogoBuffer.SetSize(wBBook, hBBook);
 
-  LoadFonts;
+  for Section := Low(TFontType) to High(TFontType) do
+    UniFont[Section] := TFont.Create;
 
   nGrExt := 0;
@@ -1572 +1582 @@
   Templates := TBitmap.Create;
   Templates.PixelFormat := pf24bit;
-  LoadGraphicFile(Templates, GetGraphicsDir + DirectorySeparator +
-    'Templates.png', gfNoGamma);
   Colors := TBitmap.Create;
   Colors.PixelFormat := pf24bit;
-  LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
   Paper := TBitmap.Create;
   Paper.PixelFormat := pf24bit;
-  LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
   BigImp := TBitmap.Create;
   BigImp.PixelFormat := pf24bit;
-  LoadGraphicFile(BigImp, GetGraphicsDir + DirectorySeparator + 'Icons.png');
   MainTexture.Image := TBitmap.Create;
   MainTextureAge := -2;
@@ -1588 +1593 @@
   InitOrnamentDone := False;
   GenerateNames := True;
+
+  LoadAssets;
 end;
 

trunk/Start.pas

@@ -155 +155 @@
     procedure SaveConfig;
     procedure LoadAiBrainsPictures;
+    procedure UpdateInterface;
   end;
 
@@ -432 +433 @@
 var
   x, i: Integer;
-  r0, r1: HRgn;
-  Location: TPoint;
   PlayerSlot: TPlayerSlot;
   AIBrains: TBrains;
@@ -445 +444 @@
   end;
   LoadConfig;
+  LoadAssets;
 
   ActionsOffered := [maConfig, maManual, maCredits, maWeb];
@@ -467 +467 @@
   DirectDlg.Top := (Screen.Height - DirectDlg.Height) div 2;
 
-  if FullScreen then begin
-    Location := Point((Screen.Width - 800) * 3 div 8,
-      Screen.Height - Height - (Screen.Height - 600) div 3);
-    Left := Location.X;
-    Top := Location.Y;
-
-    r0 := CreateRectRgn(0, 0, Width, Height);
-    r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
-    CombineRgn(r0, r0, r1, RGN_DIFF);
-    DeleteObject(r1);
-    r1 := CreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
-      QuitBtn.top + QuitBtn.Height);
-    CombineRgn(r0, r0, r1, RGN_OR);
-    DeleteObject(r1);
-    SetWindowRgn(Handle, r0, False);
-    DeleteObject(r0); // causes crash with Windows 95
-  end else begin
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
-  end;
+  UpdateInterface;
 
   Canvas.Font.Assign(UniFont[ftNormal]);
@@ -703 +684 @@
   end;
   AIBrains.Free;
+end;
+
+procedure TStartDlg.UpdateInterface;
+var
+  r0, r1: HRgn;
+  Location: TPoint;
+begin
+  if FullScreen then begin
+    Location := Point((Screen.Width - 800) * 3 div 8,
+      Screen.Height - Height - (Screen.Height - 600) div 3);
+    Left := Location.X;
+    Top := Location.Y;
+
+    r0 := CreateRectRgn(0, 0, Width, Height);
+    r1 := CreateRectRgn(TabOffset + 4 * TabSize + 2, 0, Width, TabHeight);
+    CombineRgn(r0, r0, r1, RGN_DIFF);
+    DeleteObject(r1);
+    r1 := CreateRectRgn(QuitBtn.Left, QuitBtn.Top, QuitBtn.Left + QuitBtn.Width,
+      QuitBtn.top + QuitBtn.Height);
+    CombineRgn(r0, r0, r1, RGN_OR);
+    DeleteObject(r1);
+    SetWindowRgn(Handle, r0, False);
+    DeleteObject(r0); // causes crash with Windows 95
+  end else begin
+    Left := (Screen.Width - Width) div 2;
+    Top := (Screen.Height - Height) div 2;
+  end;
 end;
 
@@ -1636 +1644 @@
           LocaleDlg := TLocaleDlg.Create(nil);
           if LocaleDlg.ShowModal = mrOk then begin
-            LoadPhrases;
+            LoadAssets;
             Invalidate;
+            UpdateInterface;
+            Background.UpdateInterface;
           end;
           FreeAndNil(LocaleDlg);