Changeset 194 for trunk/Packages/CevoComponents/ScreenTools.pas

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.

File:

• trunk/Packages/CevoComponents/ScreenTools.pas (modified) (6 diffs)

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;