Changeset 566 for Common/Forms

Timestamp:

Jun 29, 2023, 11:23:03 PM (17 months ago)

Author:

chronos

Message:

• Modified: Updated Common package.

Location:

Common/Forms

Files:

• . (added)
• FormAbout.lfm (moved) (moved from Common/FormAbout.lfm ) (6 diffs)
• FormAbout.lrj (moved) (moved from Common/FormAbout.lrj )
• FormAbout.pas (moved) (moved from Common/FormAbout.pas ) (5 diffs)
• FormTest.lfm (added)
• FormTest.lrj (added)
• FormTest.pas (added)
• FormTests.lfm (added)
• FormTests.lrj (added)
• FormTests.pas (added)

Common/Forms/FormAbout.lfm

@@ -1 +1 @@
 object FormAbout: TFormAbout
-  Left = 1014
-  Height = 349
-  Top = 577
-  Width = 609
+  Left = 624
+  Height = 402
+  Top = 622
+  Width = 702
   Caption = 'About'
-  ClientHeight = 349
-  ClientWidth = 609
-  DesignTimePPI = 125
+  ClientHeight = 402
+  ClientWidth = 702
+  DesignTimePPI = 144
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '2.2.4.0'
+  LCLVersion = '2.2.6.0'
   object LabelDescription: TLabel
-    Left = 26
-    Height = 22
-    Top = 117
-    Width = 557
+    Left = 30
+    Height = 26
+    Top = 135
+    Width = 642
     Align = alTop
-    BorderSpacing.Left = 26
-    BorderSpacing.Right = 26
-    BorderSpacing.Bottom = 26
+    BorderSpacing.Left = 30
+    BorderSpacing.Right = 30
+    BorderSpacing.Bottom = 30
     Caption = 'Description'
     ParentColor = False
@@ -26 +26 @@
   end
   object LabelContent: TLabel
-    Left = 26
-    Height = 22
-    Top = 165
-    Width = 557
+    Left = 30
+    Height = 26
+    Top = 191
+    Width = 642
     Align = alTop
-    BorderSpacing.Around = 26
+    BorderSpacing.Around = 30
     Caption = '   '
     ParentColor = False
@@ -38 +38 @@
   object PanelTop: TPanel
     Left = 0
-    Height = 117
+    Height = 135
     Top = 0
-    Width = 609
+    Width = 702
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 117
-    ClientWidth = 609
+    ClientHeight = 135
+    ClientWidth = 702
     FullRepaint = False
     ParentFont = False
     TabOrder = 0
     object LabelAppName: TLabel
-      Left = 94
-      Height = 73
-      Top = 17
-      Width = 489
+      Left = 108
+      Height = 84
+      Top = 20
+      Width = 564
       Anchors = [akTop, akLeft, akRight]
       AutoSize = False
-      BorderSpacing.Around = 26
+      BorderSpacing.Around = 30
       Caption = 'Title'
-      Font.Height = -52
+      Font.Height = -60
       ParentColor = False
       ParentFont = False
@@ -63 +63 @@
     end
     object ImageLogo: TImage
-      Left = 21
-      Height = 64
-      Top = 26
-      Width = 62
+      Left = 24
+      Height = 74
+      Top = 30
+      Width = 71
       Proportional = True
       Stretch = True
@@ -73 +73 @@
   object PanelButtons: TPanel
     Left = 0
-    Height = 65
-    Top = 284
-    Width = 609
+    Height = 75
+    Top = 327
+    Width = 702
     Align = alBottom
     BevelOuter = bvNone
-    ClientHeight = 65
-    ClientWidth = 609
+    ClientHeight = 75
+    ClientWidth = 702
     TabOrder = 1
     object ButtonHomePage: TButton
-      Left = 21
-      Height = 33
-      Top = 21
-      Width = 229
+      Left = 24
+      Height = 38
+      Top = 24
+      Width = 264
       Anchors = [akLeft, akBottom]
       Caption = 'Home page'
@@ -93 +93 @@
     end
     object ButtonClose: TButton
-      Left = 461
-      Height = 33
-      Top = 21
-      Width = 122
+      Left = 531
+      Height = 38
+      Top = 24
+      Width = 141
       Anchors = [akRight, akBottom]
       Caption = 'Close'

Common/Forms/FormAbout.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  StdCtrls, ExtCtrls, ApplicationInfo, Common, Translator, Theme;
+  StdCtrls, ExtCtrls, ApplicationInfo, Common, Translator, Theme, FormEx;
 
 type
   { TFormAbout }
 
-  TFormAbout = class(TForm)
+  TFormAbout = class(TFormEx)
     ButtonClose: TButton;
     ButtonHomePage: TButton;
@@ -21 +21 @@
     procedure ButtonHomePageClick(Sender: TObject);
     procedure FormShow(Sender: TObject);
+  private
+    FApplicationInfo: TApplicationInfo;
   public
-    AboutDialog: TObject; //TAboutDialog
     procedure UpdateInterface;
+    property ApplicationInfo: TApplicationInfo read FApplicationInfo write
+      FApplicationInfo;
   end;
 
@@ -30 +33 @@
 
 {$R *.lfm}
-
-uses
-  AboutDialog;
 
 resourcestring
@@ -43 +43 @@
 procedure TFormAbout.FormShow(Sender: TObject);
 begin
-  if Assigned(AboutDialog) then
-  with TAboutDialog(AboutDialog) do begin
-    if Assigned(Translator) then
-      Translator.TranslateComponentRecursive(Self);
-    if Assigned(ThemeManager) then
-      ThemeManager.UseTheme(Self);
-
-    if Assigned(ApplicationInfo) then
-    with ApplicationInfo do begin
-      LabelAppName.Caption := AppName;
-      LabelContent.Caption := SVersion + ': ' + Version + LineEnding +
-        SReleaseDate + ': ' + DateToStr(ReleaseDate) + LineEnding +
-        SLicense + ': ' + License;
-      LabelDescription.Caption := Description;
-      ImageLogo.Picture.Bitmap.Assign(Icon);
-    end;
+  if Assigned(ApplicationInfo) then
+  with ApplicationInfo do begin
+    LabelAppName.Caption := AppName;
+    LabelContent.Caption := SVersion + ': ' + Version + LineEnding +
+      SReleaseDate + ': ' + DateToStr(ReleaseDate) + LineEnding +
+      SLicense + ': ' + License;
+    LabelDescription.Caption := Description;
+    ImageLogo.Picture.Bitmap.Assign(Icon);
   end;
   UpdateInterface;
@@ -65 +57 @@
 procedure TFormAbout.UpdateInterface;
 begin
-  ButtonHomePage.Enabled := Assigned(AboutDialog) and
-    Assigned(TAboutDialog(AboutDialog).ApplicationInfo);
+  ButtonHomePage.Enabled := Assigned(ApplicationInfo);
 end;
 
 procedure TFormAbout.ButtonHomePageClick(Sender: TObject);
 begin
-  OpenWebPage(TAboutDialog(AboutDialog).ApplicationInfo.HomePage);
+  OpenWebPage(ApplicationInfo.HomePage);
 end;