Changeset 567 for Common

Timestamp:

Jun 30, 2023, 10:09:00 PM (17 months ago)

Author:

chronos

Message:

• Modified: Improved TFormEx class.

Location:

Common

Files:

• FormEx.pas (modified) (4 diffs)
• Languages/FormAbout.cs.po (modified) (1 diff)
• Languages/FormAbout.pot (modified) (1 diff)
• Languages/FormTest.cs.po (modified) (1 diff)
• Languages/FormTest.pot (modified) (1 diff)
• Languages/FormTests.cs.po (modified) (1 diff)
• Languages/FormTests.pot (modified) (1 diff)

Common/FormEx.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, PersistentForm, Theme, Translator;
+  Classes, SysUtils, Forms, PersistentForm, Theme, Translator, ScaleDPI;
 
 type
@@ -13 +13 @@
   private
     FCounter: Integer; static;
+  protected
+    procedure DoShow; override;
+    procedure DoCreate; override;
+    procedure DoClose(var CloseAction: TCloseAction); override;
+    procedure DoDestroy; override;
   public
     PersistentForm: TPersistentForm; static;
     ThemeManager: TThemeManager; static;
     Translator: TTranslator; static;
-    procedure DoShow; override;
-    procedure DoCreate; override;
-    procedure DoClose(var CloseAction: TCloseAction); override;
-    procedure DoDestroy; override;
+    ScaleDPI: TScaleDPI; static;
+    OwnsPersistentForm: Boolean; static;
+    OwnsThemeManager: Boolean; static;
+    OwnsTranslator: Boolean; static;
+    OwnsScaleDPI: Boolean; static;
   end;
 
@@ -43 +49 @@
 procedure TFormEx.DoCreate;
 begin
-  if not Assigned(PersistentForm) then
+  if not Assigned(PersistentForm) then begin
+    OwnsPersistentForm := True;
     PersistentForm := TPersistentForm.Create(nil);
-  if not Assigned(ThemeManager) then
+  end;
+  if not Assigned(ThemeManager) then begin
+    OwnsThemeManager := True;
     ThemeManager := TThemeManager.Create(nil);
+  end;
   if not Assigned(Translator) then begin
     Translator := TTranslator.Create(nil);
     Translator.POFilesFolder := 'Languages';
     Translator.Language := Translator.Languages.SearchByCode('');
+    OwnsTranslator := True;
   end;
+  if not Assigned(ScaleDPI) then begin
+    OwnsScaleDPI := True;
+    ScaleDPI := TScaleDPI.Create(nil);
+  end;
+
   Translator.TranslateComponentRecursive(Self);
   ThemeManager.UseTheme(Self);
@@ -68 +84 @@
   Dec(FCounter);
   if FCounter <= 0 then begin
-    FreeAndNil(PersistentForm);
-    FreeAndNil(ThemeManager);
-    FreeAndNil(Translator);
+    if OwnsPersistentForm then begin
+      FreeAndNil(PersistentForm);
+      OwnsPersistentForm := False;
+    end;
+    if OwnsThemeManager then begin
+      FreeAndNil(ThemeManager);
+      OwnsThemeManager := False;
+    end;
+    if OwnsTranslator then begin
+      FreeAndNil(Translator);
+      OwnsTranslator := False;
+    end;
+    if OwnsScaleDPI then begin
+      FreeAndNil(ScaleDPI);
+      OwnsScaleDPI := False;
+    end;
   end;
   inherited;

Common/Languages/FormAbout.cs.po

@@ -26 +26 @@
 msgid "Version"
 msgstr "Verze"
+
+#: tformabout.caption
+msgid "About"
+msgstr "O aplikaci"

Common/Languages/FormAbout.pot

@@ -14 +14 @@
 msgstr ""
 
+#: tformabout.caption
+msgid "About"
+msgstr ""
+

Common/Languages/FormTest.cs.po

@@ -12 +12 @@
 "X-Generator: Poedit 3.0.1\n"
 
-#: formtest.snone
-msgid "None"
-msgstr "Žádný"
-
-#: formtest.spassed
-msgid "Passed"
-msgstr "Prošlo"
-
-#: formabout.sfailed
-msgid "Failed"
-msgstr "Selhalo"
+#: tformtest.caption
+msgid "Test"
+msgstr "Test"

Common/Languages/FormTest.pot

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: formtest.snone
-msgid "None"
+#: tformtest.caption
+msgid "Test"
 msgstr ""
-
-#: formtest.spassed
-msgid "Passed"
-msgstr ""
-
-#: formabout.sfailed
-msgid "Failed"
-msgstr ""

Common/Languages/FormTests.cs.po

@@ -13 +13 @@
 
 #: tformtests.caption
-msgid "Test"
-msgstr "Test"
+msgid "Tests"
+msgstr "Testy"
 
 #: tformtests.listviewtestcases.columns[0].caption

Common/Languages/FormTests.pot

@@ -3 +3 @@
 
 #: tformtests.caption
-msgid "Test"
+msgid "Tests"
 msgstr ""