Changeset 48 for trunk

Timestamp:

Dec 3, 2021, 2:07:27 PM (3 years ago)

Author:

chronos

Message:

• Added: Show default profile photo if contact image is not specified.

Location:

trunk

Files:

• Forms/UFormContact.lfm (modified) (1 diff)
• Forms/UFormContact.pas (modified) (7 diffs)
• Images/Profile.png (added)
• UCore.pas (modified) (5 diffs)

trunk/Forms/UFormContact.lfm

@@ -137 +137 @@
         Top = 16
         Width = 207
+        Center = True
         PopupMenu = PopupMenuPhoto
         Proportional = True

trunk/Forms/UFormContact.pas

@@ -147 +147 @@
     FOnPrevious: TNotifyEvent;
     FormProperties: TFormProperties;
+    ProfilePhotoActive: Boolean;
+    procedure DefaultPhoto;
     procedure SetContact(AValue: TContact);
     procedure ReloadAllPropertiesTab;
@@ -210 +212 @@
 
   // Photo
-  if (ImagePhoto.Picture.Bitmap.Width <> 0) and (ImagePhoto.Picture.Bitmap.Height <> 0) then begin
+  if ProfilePhotoActive then begin
     PhotoProperty := Contact.GetProperty(cfPhoto);
     if not Assigned(PhotoProperty) then begin
@@ -292 +294 @@
               ImagePhoto.Picture.Bitmap.SetSize(JpegImage.Width, JpegImage.Height);
               ImagePhoto.Picture.Bitmap.Canvas.Draw(0, 0, JpegImage);
+              ProfilePhotoActive := True;
             except
+              DefaultPhoto;
             end;
           finally
@@ -300 +304 @@
           try
             ImagePhoto.Picture.LoadFromStream(Stream);
+            ProfilePhotoActive := True;
           except
+            DefaultPhoto;
           end;
         end;
@@ -306 +312 @@
         Stream.Free;
       end;
-    end;
-  end;
+    end else DefaultPhoto;
+  end else DefaultPhoto;
 end;
 
@@ -400 +406 @@
 end;
 
+procedure TFormContact.DefaultPhoto;
+begin
+  ProfilePhotoActive := False;
+  ImagePhoto.Picture.Assign(Core.GetProfileImage.Picture);
+end;
+
 procedure TFormContact.SetContact(AValue: TContact);
 begin
@@ -458 +470 @@
 procedure TFormContact.UpdateInterface;
 begin
-  APhotoSave.Enabled := (ImagePhoto.Picture.Bitmap.Width <> 0) and
-    (ImagePhoto.Picture.Bitmap.Height <> 0);
+  APhotoSave.Enabled := ProfilePhotoActive;
 end;
 

trunk/UCore.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Controls, ActnList, Forms, Dialogs,
+  Classes, SysUtils, FileUtil, Controls, ActnList, Forms, Dialogs, ExtCtrls,
   ULastOpenedList, UApplicationInfo, UPersistentForm, UScaleDPI, UCommon,
   UTranslator, UDataFile, Menus, URegistry, UTheme, UAboutDialog, Registry;
@@ -69 +69 @@
     InitializeFinished: Boolean;
     LoadErrors: string;
+    ProfileImage: TImage;
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
@@ -81 +82 @@
     ReopenLastFileOnStart: Boolean;
     ToolbarVisible: Boolean;
+    function GetProfileImage: TImage;
     procedure FileNew;
     procedure FileOpen(FileName: string);
@@ -294 +296 @@
   FileClose;
   SaveConfig;
+  if Assigned(ProfileImage) then
+    FreeAndNil(ProfileImage);
 end;
 
@@ -454 +458 @@
 end;
 
+function TCore.GetProfileImage: TImage;
+const
+  ProfilePhotoFileName = 'Images/Profile.png';
+begin
+  if not Assigned(ProfileImage) then begin
+    ProfileImage := TImage.Create(nil);
+    ProfileImage.Picture.LoadFromFile(ProfilePhotoFileName);
+    if FileExists(ProfilePhotoFileName) then
+      ProfileImage.Picture.LoadFromFile(ProfilePhotoFileName);
+  end;
+  Result := ProfileImage;
+end;
+
 procedure TCore.UpdateInterface;
 begin