Changeset 25 for trunk/UCore.pas

Timestamp:

Sep 10, 2022, 6:54:43 PM (2 years ago)

Author:

chronos

Message:

• Modified: CoolTranslator replaced by Common package.
• Modified: Update common package.

File:

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

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Controls, ActnList, UDatabase, UCoolTranslator,
+  Classes, SysUtils, FileUtil, Controls, ActnList, UDatabase, UTranslator,
   UApplicationInfo, UPersistentForm, Forms, URegistry, UScaleDPI;
 
@@ -20 +20 @@
     AExit: TAction;
     ActionList1: TActionList;
-    CoolTranslator1: TCoolTranslator;
+    Translator1: TTranslator;
     ImageList1: TImageList;
     PersistentForm1: TPersistentForm;
@@ -29 +29 @@
     procedure AExitExecute(Sender: TObject);
     procedure APreferencesExecute(Sender: TObject);
-    procedure CoolTranslator1Translate(Sender: TObject);
+    procedure Translator1Translate(Sender: TObject);
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -57 +57 @@
 
 uses
-  UFormTables, UFormConnect,
-  UFormDatabases, UFormPreferences, UFormMain, UFormAbout;
+  UFormTables, UFormConnect, UAboutDialog, UFormDatabases, UFormPreferences,
+  UFormMain;
 
 {$R *.lfm}
@@ -97 +97 @@
 procedure TCore.AAboutExecute(Sender: TObject);
 begin
-  FormAbout := TFormAbout.Create(nil);
-  FormAbout.ApplicationInfo := ApplicationInfo1;
-  FormAbout.ShowModal;
-  FormAbout.Free;
+  with TAboutDialog.Create(nil) do
+  try
+    ApplicationInfo := ApplicationInfo1;
+    Show;
+  finally
+    Free;
+  end;
 end;
 
@@ -111 +114 @@
 end;
 
-procedure TCore.CoolTranslator1Translate(Sender: TObject);
+procedure TCore.Translator1Translate(Sender: TObject);
 var
   I: Integer;
 begin
   for I := 0 to DbManager.DataTypes.Count - 1 do begin
-    TDataType(DbManager.DataTypes[I]).Title := CoolTranslator1.TranslateText(TDataType(DbManager.DataTypes[I]).Title, TDataType(DbManager.DataTypes[I]).Title);
+    TDataType(DbManager.DataTypes[I]).Title := Translator1.TranslateText(TDataType(DbManager.DataTypes[I]).Title, TDataType(DbManager.DataTypes[I]).Title);
   end;
 end;
@@ -143 +146 @@
     Preferences.RememberDatabase := GetValue('RememberDatabase', True);
     Preferences.LastDatabaseName := GetValue('LastDatabaseName', '');
-    CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(
+    Translator1.Language := Translator1.Languages.SearchByCode(
       GetValue('Language', ''));
   finally
@@ -158 +161 @@
     SetValue('RememberDatabase', Preferences.RememberDatabase);
     SetValue('LastDatabaseName', Preferences.LastDatabaseName);
-    SetValue('Language', CoolTranslator1.Language.Code);
+    SetValue('Language', Translator1.Language.Code);
   finally
     Free;
@@ -170 +173 @@
 begin
   if not Initialized then begin
-    {$IFDEF Linux}
+    {$IFDEF UNIX}
     // If installed in Linux system then use installation directory for po files
     if Application.ExeName = '/usr/bin/MyData' then
-      CoolTranslator1.POFilesFolder := '/usr/share/MyData/languages';
+      Translator1.POFilesFolder := '/usr/share/MyData/languages';
     {$ENDIF}
     FormConnect.Init;