Changeset 131 for trunk/Packages

Timestamp:

Apr 9, 2022, 12:13:45 PM (3 years ago)

Author:

chronos

Message:

• Modified: Contact image unit moved into VCard package.

Location:

trunk/Packages/VCard

Files:

• UContactImage.pas (moved) (moved from trunk/UContactImage.pas ) (5 diffs)
• UVCard.pas (modified) (1 diff)
• VCard.lpk (modified) (2 diffs)

trunk/Packages/VCard/UContactImage.pas

@@ -11 +11 @@
   { TContactImage }
 
-  TContactImage = class
+  TContactImage = class(TComponent)
   private
     FOnChange: TNotifyEvent;
@@ -36 +36 @@
     procedure LoadFromFile(FileName: string);
     procedure SaveToFile(FileName: string);
-    procedure Assign(Source: TContactImage);
-    constructor Create;
+    procedure Assign(Source: TPersistent); override;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
+  published
     property Url: string read FUrl write SetUrl;
     property Used: Boolean read FUsed write SetUsed;
@@ -44 +45 @@
   end;
 
+procedure Register;
+
 
 implementation
 
+procedure Register;
+begin
+  RegisterComponents('VCard', [TVCard]);
+end;
 
 { TContactImage }
@@ -349 +356 @@
 end;
 
-procedure TContactImage.Assign(Source: TContactImage);
-begin
-  Bitmap.Assign(Source.Bitmap);
-  Url := Source.Url;
-  Loaded := Source.Loaded;
-  Modified := Source.Modified;
-  Format := Source.Format;
-  FieldIndex := Source.FieldIndex;
-  Contact := Source.Contact;
-  Used := Source.Used;
-end;
-
-constructor TContactImage.Create;
-begin
+procedure TContactImage.Assign(Source: TPersistent);
+var
+  SourceImage: TContactImage;
+begin
+  inherited;
+  if Source is TContactImage then begin
+    SourceImage := Source as TContactImage;
+    Bitmap.Assign(SourceImage.Bitmap);
+    Url := SourceImage.Url;
+    Loaded := SourceImage.Loaded;
+    Modified := SourceImage.Modified;
+    Format := SourceImage.Format;
+    FieldIndex := SourceImage.FieldIndex;
+    Contact := SourceImage.Contact;
+    Used := SourceImage.Used;
+  end;
+end;
+
+constructor TContactImage.Create(AOwner: TComponent);
+begin
+  inherited;
   Bitmap := TBitmap.Create;
 end;
@@ -372 +386 @@
 end;
 
-
 end.
 

trunk/Packages/VCard/UVCard.pas

@@ -360 +360 @@
 procedure Register;
 begin
-  RegisterComponents('Common', [TVCard]);
+  RegisterComponents('VCard', [TVCard]);
 end;
 

trunk/Packages/VCard/VCard.lpk

@@ -8 +8 @@
       <Version Value="11"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)/"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
       <Parsing>
@@ -47 +47 @@
         <UnitName Value="UQuotedPrintable"/>
       </Item>
+      <Item>
+        <Filename Value="UContactImage.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UContactImage"/>
+      </Item>
     </Files>
     <i18n>