Changeset 717 for branches/zoom/Packages/CevoComponents

Timestamp:

Jan 10, 2026, 12:15:35 PM (4 weeks ago)

Author:

chronos

Message:

Merged revision(s) 705-716 from trunk:

• Fixed: Subversion properties.
• Fixed: Better start screen location calculation for lower than 800x600 resolutions to make visible entire window.
• Fixed: Memory overflow in minimap drawing with some higher DPI settings.
• Fixed: Crashes with mini map drawing in Start screen with some DPI resolutions.
• Added: Enter key confirms battle dialog window.
• Fixed: Potential battle dialog drawing issue.
• Modified: Code cleanup.
• Fixed: Disable auto selection of input text in message dialog.
• Fixed: Edit boxes to have black background and blue selection.
• Fixed: Automatically create Saved and Maps user data directories if they don't exist yet.
• Modified: Code cleanup.
• Fixed: Wrong unit models opened after click on Military report foreign units.
• Modified: Do not store .png file extension in graphics names in book files. This is for compatibility with older C-evo versions.
• Fixed: Support both books with graphics name with and without .png file extensions.

Location:

branches/zoom

Files:

• . (modified) (1 prop)
• Packages/CevoComponents/Directories.pas (modified) (4 diffs)
• Packages/CevoComponents/ScreenTools.pas (modified) (9 diffs)
• Packages/CevoComponents/Texture.pas (modified) (1 diff)

branches/zoom/Packages/CevoComponents/Directories.pas

@@ -22 +22 @@
 
 uses
-  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms;
+  FileUtil, LCLIntf, LCLType, LCLProc, LazUTF8, SysUtils, LazFileUtils, Forms,
+  Translations;
 
 function GetAppSharePath(Path: string): string;
@@ -33 +34 @@
   {$IFDEF UNIX}
   // If installed in Linux system then try to use different installation directory
+  NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
+    DirectorySeparator + 'share' + DirectorySeparator +
+    ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
+
   if not DirectoryExists(Result) then begin
-    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
-      DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
     if DirectoryExists(NewPath) then begin
       Result := NewPath;
@@ -42 +44 @@
     end;
   end;
+
   if not FileExists(Result) then begin
-    NewPath := ExtractFileDir(Application.ExeName) + DirectorySeparator + '..' +
-      DirectorySeparator + 'share' + DirectorySeparator +
-      ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Path;
     if FileExists(NewPath) then begin
       Result := NewPath;
@@ -56 +56 @@
 function GetLocale: string;
 var
-  Lang: string;
   I: Integer;
-  T: string;
+  LanguageID: TLanguageID;
 begin
   // Win32 user may decide to override locale with LANG variable.
-  Lang := Copy(GetEnvironmentVariableUTF8('LANG'), 1, 2);
+  Result := Copy(GetEnvironmentVariableUTF8('LANG'), 1, 2);
 
-  if Lang = '' then begin
-    for I := 1 to Paramcount - 1 do
+  if Result = '' then begin
+    for I := 1 to ParamCount - 1 do
       if (ParamStrUTF8(I) = '--LANG') or (ParamStrUTF8(I) = '-l') or
         (ParamStrUTF8(I) = '--lang') then
-          Lang := ParamStrUTF8(I + 1);
+          Result := ParamStrUTF8(I + 1);
   end;
-  if Lang = '' then begin
-    T := '';
-    LazGetLanguageIDs(Lang, T);
-    Lang := Copy(Lang, 1, 2);
+  if Result = '' then begin
+    LanguageID := GetLanguageID;
+    Result := Copy(LanguageID.LanguageID, 1, 2);
   end;
-
-  Result := Lang;
 end;
 

branches/zoom/Packages/CevoComponents/ScreenTools.pas

@@ -116 +116 @@
 
 const
+  BmpExt = '.bmp';
+  PngExt = '.png';
+  JpgExt = '.jpg';
+
   TransparentColor1 = $FF00FF;
   TransparentColor2 = $7F007F;
@@ -434 +438 @@
   Result := False;
   if ExtractFileExt(FileName) = '' then
-    FileName := FileName + '.png';
+    FileName := FileName + PngExt;
 
   if FileExists(FileName) then begin
-    if ExtractFileExt(FileName) = '.jpg' then begin
+    if ExtractFileExt(FileName) = JpgExt then begin
       Jpeg := TJpegImage.Create;
       try
@@ -451 +455 @@
       FreeAndNil(Jpeg);
     end else
-    if ExtractFileExt(FileName) = '.png' then begin
+    if ExtractFileExt(FileName) = PngExt then begin
       Png := TPortableNetworkGraphic.Create;
       try
@@ -473 +477 @@
       FreeAndNil(Png);
     end else
-    if ExtractFileExt(FileName) = '.bmp' then begin
+    if ExtractFileExt(FileName) = BmpExt then begin
       try
         Bmp.LoadFromFile(FileName);
@@ -1799 +1803 @@
 
 procedure Gtk2DisableControlStyling(WinControl: TWinControl);
-begin
+{$IFDEF LCLGTK2}
+var
+  GtkWhite: string;
+  GtkBlue: string;
+  GtkBlack: string;
+  GtkOrange: string;
+{$ENDIF}
+begin
+  {$IFDEF LCLGTK2}
   // https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/38516
-  {$IFDEF LCLGTK2}
+  GtkBlue := '{ 0.373, 0.467, 0.796 }';
+  GtkWhite := '{ 1.0, 1.0, 1.0 }';
+  GtkBlack := '{ 0, 0, 0 }';
+  GtkOrange := '{ 0.373, 0.465, 0.793 }';
+
   // parse gtkrc from string
   gtk_rc_parse_string(PChar('style "noengine" {' + LineEnding +
-    'engine "" {}' + LineEnding +
+    'engine "" { }' + LineEnding +
+
+    'base[INSENSITIVE] = ' + GtkBlack + LineEnding +
+    'base[PRELIGHT] = ' + GtkBlack + LineEnding +
+    'base[NORMAL] = ' + GtkBlack + LineEnding +
+    'base[SELECTED] = ' + GtkBlue + LineEnding +
+    'base[ACTIVE] = ' + GtkBlack + LineEnding +
+
+    'text[INSENSITIVE] = ' + GtkOrange + LineEnding +
+    'text[NORMAL] = ' + GtkOrange + LineEnding +
+    'text[PRELIGHT] = ' + GtkOrange + LineEnding +
+    'text[SELECTED] = ' + GtkWhite + LineEnding +
+    'text[ACTIVE] = ' + GtkOrange + LineEnding +
+
     '}' + LineEnding +
     'widget "*.your-edit" style "noengine"'));
@@ -1857 +1886 @@
   LoadPhrases;
   LoadFonts;
-  Templates := LoadGraphicSet('Templates.png', False);
+  Templates := LoadGraphicSet('Templates' + PngExt, False);
   with Templates do begin
     Logo := GetItem('Logo');
@@ -1873 +1902 @@
   end;
 
-  LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors.png');
-  LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper.jpg');
-  LoadGraphicFile(BigImp, GetGraphicsDir + DirectorySeparator + 'Icons.png');
+  LoadGraphicFile(Colors, GetGraphicsDir + DirectorySeparator + 'Colors' + PngExt);
+  LoadGraphicFile(Paper, GetGraphicsDir + DirectorySeparator + 'Paper' + JpgExt);
+  LoadGraphicFile(BigImp, GetGraphicsDir + DirectorySeparator + 'Icons' + PngExt);
 end;
 
@@ -1898 +1927 @@
   GrExt := TGraphicSets.Create;
 
-  HGrSystem := LoadGraphicSet('System.png');
+  HGrSystem := LoadGraphicSet('System' + PngExt);
   with HGrSystem do begin
     CityMark1 := GetItem('CityMark1');
@@ -1904 +1933 @@
   end;
 
-  HGrSystem2 := LoadGraphicSet('System2.png');
+  HGrSystem2 := LoadGraphicSet('System2' + PngExt);
   with HGrSystem2 do begin
     Ornament := GetItem('Ornament');

branches/zoom/Packages/CevoComponents/Texture.pas

@@ -47 +47 @@
   FAge := AValue;
   LoadGraphicFile(Image, GetGraphicsDir + DirectorySeparator +
-    'Texture' + IntToStr(Age + 1) + '.jpg');
+    'Texture' + IntToStr(Age + 1) + JpgExt);
   ColorBevelLight := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelLight];
   ColorBevelShade := Colors.Canvas.Pixels[clkAge0 + Age, cliBevelShade];