Changeset 115 for trunk/UCore.pas

Timestamp:

Oct 13, 2020, 8:05:14 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build with Lazarus 2.0.10.
• Modified: CoolTranslator package replaced by Translator in Common package.
• Modified: About dialog moved to Common package.

File:

• trunk/UCore.pas (modified) (6 diffs)

trunk/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UApplicationInfo, ULastOpenedList, UProject,
-  UCoolTranslator, UTarget, URegistry, Registry, Graphics, Controls, UScaleDPI,
-  UPersistentForm, UTheme, UBFTarget;
+  UTranslator, UTarget, URegistry, Registry, Graphics, Controls, UScaleDPI,
+  UPersistentForm, UTheme, UAboutDialog, UBFTarget;
 
 type
@@ -15 +15 @@
 
   TCore = class(TDataModule)
+    AboutDialog: TAboutDialog;
     ApplicationInfo: TApplicationInfo;
-    CoolTranslator1: TCoolTranslator;
+    Translator: TTranslator;
     ImageListMain: TImageList;
     LastOpenedList: TLastOpenedList;
@@ -82 +83 @@
   // If installed in Linux system then use installation directory for po files
   if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-    CoolTranslator1.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
+    Translator.POFilesFolder := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + '/languages';
   {$ENDIF}
 
@@ -103 +104 @@
     OpenProjectOnStart := ReadBoolWithDefault('OpenProjectOnStart', True);
     if ValueExists('LanguageCode') then
-      CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
-      else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+      Translator.Language := Translator.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+      else Translator.Language := Translator.Languages.SearchByCode('');
     ScaleDPI1.DPI := Point(ReadIntegerWithDefault('DPIX', 96),
       ReadIntegerWithDefault('DPIY', 96));
@@ -134 +135 @@
     WriteInteger('MemorySize', MemorySize);
     WriteInteger('CellSize', CellSize);
-    if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-      WriteString('LanguageCode', CoolTranslator1.Language.Code)
+    if Assigned(Translator.Language) and (Translator.Language.Code <> '') then
+      WriteString('LanguageCode', Translator.Language.Code)
       else DeleteValue('LanguageCode');
     WriteString('Theme', ThemeManager.Theme.Name);
@@ -191 +192 @@
 begin
   ScaleDPI;
-  CoolTranslator1.Translate;
+  Translator.Translate;
 end;