Changeset 139 for trunk/Forms/UFormContact.pas

Timestamp:

Aug 26, 2022, 8:09:41 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Wrong assignment during openning contact image form.
• Fixed: QR code generation error if contact text is too big (with photo or logo).

File:

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

trunk/Forms/UFormContact.pas

@@ -171 +171 @@
     OpenPictureDialog1: TOpenPictureDialog;
     PageControlContact: TPageControl;
+    PanelNotes: TPanel;
+    PanelQrCode: TPanel;
     PopupMenuQrCode: TPopupMenu;
     PopupMenuPhoto: TPopupMenu;
@@ -182 +184 @@
     SpeedButtonWorkEmail: TSpeedButton;
     SpeedButtonWorkWeb: TSpeedButton;
+    Splitter1: TSplitter;
     TabSheetAll: TTabSheet;
     TabSheetChat: TTabSheet;
@@ -206 +209 @@
     procedure ImagePhotoClick(Sender: TObject);
     procedure MenuItemSaveQrToFileClick(Sender: TObject);
+    procedure PanelQrCodeResize(Sender: TObject);
     procedure SpeedButtonHomeWebClick(Sender: TObject);
     procedure SpeedButtonAniversaryClick(Sender: TObject);
@@ -378 +382 @@
 end;
 
+procedure TFormContact.PanelQrCodeResize(Sender: TObject);
+begin
+  BarcodeQR1.SetBounds(BarcodeQR1.Left, BarcodeQR1.Top,
+    PanelQrCode.Width - BarcodeQR1.Left * 2,
+    PanelQrCode.Width - BarcodeQR1.Left * 2);
+end;
+
 procedure TFormContact.SpeedButtonHomeWebClick(Sender: TObject);
 begin
@@ -563 +574 @@
 
 procedure TFormContact.TabSheetOthersShow(Sender: TObject);
+var
+  ContactWithoutImages: TContact;
 begin
   MemoNotes.Lines.Text := Contact.Fields[cfNote];
   BarcodeQR1.Text := Contact.AsString;
+  if BarcodeQR1.ErrorString <> '' then begin
+    ContactWithoutImages := TContact.Create;
+    try
+      ContactWithoutImages.Assign(Contact);
+      ContactWithoutImages.ParentVCard := Contact.ParentVCard;
+      while ContactWithoutImages.HasField(cfPhoto) do
+        ContactWithoutImages.Fields[cfPhoto] := '';
+      while ContactWithoutImages.HasField(cfLogo) do
+        ContactWithoutImages.Fields[cfLogo] := '';
+      BarcodeQR1.Text := ContactWithoutImages.AsString;
+      if BarcodeQR1.ErrorString <> '' then begin
+        BarcodeQR1.Text := '';
+        BarcodeQR1.Visible := False;
+      end else BarcodeQR1.Visible := True;
+    finally
+      ContactWithoutImages.Free;
+    end;
+  end else BarcodeQR1.Visible := True;
 end;
 
@@ -819 +850 @@
 
   // Set Barcode unpublished properties
-  BarcodeQR1.Anchors := [akTop, akRight];
+  BarcodeQR1.Anchors := [akTop, akLeft];
   BarcodeQR1.PopupMenu := PopupMenuQrCode;
 end;