Changeset 207 for trunk/UCore.pas

Timestamp:

Sep 20, 2021, 10:16:37 AM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Modified: CoolTranslator package merged into Common package.
• Fixed: Build with Lazarus 2.0.12

File:

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

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, UAcronym, UCoolTranslator, UPersistentForm,
+  Classes, SysUtils, FileUtil, UAcronym, UTranslator, UPersistentForm,
   UJobProgressView, UScaleDPI, Forms, Controls, ExtCtrls, Menus, LazFileUtils,
-  URegistry, UApplicationInfo, Registry, UTheme;
+  URegistry, UApplicationInfo, Registry, UTheme, UAboutDialog;
 
 type
@@ -16 +16 @@
   TCore = class(TDataModule)
     ApplicationInfo1: TApplicationInfo;
-    CoolTranslator1: TCoolTranslator;
+    ThemeManager: TThemeManager;
+    Translator: TTranslator;
     ImageList1: TImageList;
     ImageListLarge: TImageList;
@@ -31 +32 @@
     ScaleDPI1: TScaleDPI;
     TrayIcon1: TTrayIcon;
-    procedure CoolTranslator1Translate(Sender: TObject);
+    procedure TranslatorTranslate(Sender: TObject);
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -48 +49 @@
     InitializeStarted: Boolean;
     InitializeFinished: Boolean;
-    ThemeManager: TThemeManager;
     procedure Initialize;
     procedure LoadConfig;
@@ -87 +87 @@
   InitializeFinished := False;
   StoredDimension := TControlDimension.Create;
-  ThemeManager := TThemeManager.Create(nil);
 end;
 
 procedure TCore.DataModuleDestroy(Sender: TObject);
 begin
-  FreeAndNil(ThemeManager);
   FreeAndNil(StoredDimension);
   FreeAndNil(AcronymDb);
@@ -103 +101 @@
 end;
 
-procedure TCore.CoolTranslator1Translate(Sender: TObject);
+procedure TCore.TranslatorTranslate(Sender: TObject);
 begin
   UAcronym.Translate;
@@ -211 +209 @@
     ScaleDPI1.AutoDetect := ReadBoolWithDefault('DPIAuto', 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('');
     AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
     StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
@@ -233 +231 @@
     WriteInteger('DPIY', ScaleDPI1.DPI.Y);
     WriteBool('DPIAuto', ScaleDPI1.AutoDetect);
-    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');
     WriteBool('AlwaysOnTop', AlwaysOnTop);