Changeset 93 for trunk/Forms/UFormContact.pas

Timestamp:

Feb 3, 2022, 10:30:03 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Non-string properties were incorrectly escaped.
• Modified: Avoid loading and storing contact image during switching tabs.

File:

• trunk/Forms/UFormContact.pas (modified) (8 diffs)

trunk/Forms/UFormContact.pas

@@ -203 +203 @@
   private
     FProfilePhotoActive: Boolean;
+    FProfilePhotoLoaded: Boolean;
+    FProfilePhotoModified: Boolean;
     procedure SetProfilePhotoActive(AValue: Boolean);
   private
@@ -240 +242 @@
   FormProperties.Align := alClient;
   FormProperties.Show;
+
+  FProfilePhotoLoaded := False;
 
   // Force to load default profile image
@@ -320 +324 @@
 
   // Photo
+  if FProfilePhotoModified then begin
   if ProfilePhotoActive then begin
     PhotoProperty := Contact.GetProperty(cfPhoto);
@@ -388 +393 @@
        Contact.Properties.Remove(PhotoProperty);
   end;
+    FProfilePhotoModified := False;
+  end;
 
   ReloadAllPropertiesTab;
@@ -421 +428 @@
   // Photo
   PhotoProperty := Contact.GetProperty(cfPhoto);
+  if not FProfilePhotoLoaded then begin
   if Assigned(PhotoProperty) then begin
+    FProfilePhotoLoaded := True;
+    FProfilePhotoModified := True;
     Photo := Contact.Fields[cfPhoto];
     if (Photo <> '') and (PhotoProperty.Encoding <> '') then begin
@@ -497 +507 @@
     end else ProfilePhotoActive := False;
   end else ProfilePhotoActive := False;
+  end;
 end;
 
@@ -662 +673 @@
   if OpenPictureDialog1.Execute then begin
     ImagePhoto.Picture.LoadFromFile(OpenPictureDialog1.FileName);
+    FProfilePhotoModified := True;
+    FProfilePhotoLoaded := True;
     ProfilePhotoActive := True;
   end;
@@ -668 +681 @@
 procedure TFormContact.APhotoClearExecute(Sender: TObject);
 begin
+  FProfilePhotoModified := True;
   ProfilePhotoActive := False;
 end;