Changeset 112 for trunk

Timestamp:

Feb 15, 2022, 9:42:57 AM (3 years ago)

Author:

chronos

Message:

• Fixed: Contact photo was not saved correctly.
• Fixed: URL contact photo was incorrectly encoded with BASE64 encoding.
• Fixed: Disabled not correctly working autodetection of max. line length.
• Fixed: Tab order in Contact name details window.

Location:

trunk

Files:

• Forms/UFormContact.lfm (modified) (14 diffs)
• Forms/UFormNameDetails.lfm (modified) (5 diffs)
• Packages/Common/UCommon.pas (modified) (7 diffs)
• UContact.pas (modified) (1 diff)
• UContactImage.pas (modified) (3 diffs)
• UCore.lfm (modified) (1 diff)
• vCardStudio.lpi (modified) (1 diff)

trunk/Forms/UFormContact.lfm

@@ -90 +90 @@
         Width = 265
         ParentFont = False
-        TabOrder = 2
+        TabOrder = 3
       end
       object EditPhone: TEdit
@@ -98 +98 @@
         Width = 265
         ParentFont = False
-        TabOrder = 4
+        TabOrder = 5
       end
       object Label3: TLabel
@@ -114 +114 @@
         Width = 216
         ParentFont = False
-        TabOrder = 6
+        TabOrder = 7
       end
       object Label4: TLabel
@@ -130 +130 @@
         Width = 216
         ParentFont = False
-        TabOrder = 9
+        TabOrder = 10
       end
       object Label22: TLabel
@@ -182 +182 @@
         Width = 224
         ParentFont = False
-        TabOrder = 1
+        TabOrder = 2
       end
       object Label45: TLabel
@@ -198 +198 @@
         Width = 217
         ParentFont = False
-        TabOrder = 10
+        TabOrder = 11
       end
       object Label9: TLabel
@@ -214 +214 @@
         Width = 265
         ParentFont = False
-        TabOrder = 3
+        TabOrder = 4
       end
       object EditPager: TEdit
@@ -222 +222 @@
         Width = 265
         ParentFont = False
-        TabOrder = 5
+        TabOrder = 6
       end
       object Label10: TLabel
@@ -246 +246 @@
         Width = 666
         ParentFont = False
-        TabOrder = 8
+        TabOrder = 9
       end
       object Label49: TLabel
@@ -262 +262 @@
         Width = 265
         ParentFont = False
-        TabOrder = 7
+        TabOrder = 8
       end
       object Label56: TLabel
@@ -278 +278 @@
         Width = 265
         ParentFont = False
-        TabOrder = 11
+        TabOrder = 12
       end
       object SpeedButtonWeb: TSpeedButton
@@ -335 +335 @@
         Caption = 'Details'
         OnClick = ButtonNameDetailsClick
-        TabOrder = 12
+        TabOrder = 1
       end
     end
@@ -432 +432 @@
         Anchors = [akTop, akLeft, akRight]
         Caption = 'Address'
-        ClientHeight = 259
+        ClientHeight = 285
         ClientWidth = 895
         TabOrder = 6
@@ -674 +674 @@
         Width = 920
         Caption = 'Address'
-        ClientHeight = 255
+        ClientHeight = 281
         ClientWidth = 918
         TabOrder = 9

trunk/Forms/UFormNameDetails.lfm

@@ -21 +21 @@
     Anchors = [akTop, akLeft, akRight]
     ParentFont = False
-    TabOrder = 0
+    TabOrder = 1
   end
   object Label1: TLabel
@@ -46 +46 @@
     Anchors = [akTop, akLeft, akRight]
     ParentFont = False
-    TabOrder = 1
+    TabOrder = 3
   end
   object EditMiddleName: TEdit
@@ -80 +80 @@
     Anchors = [akTop, akLeft, akRight]
     ParentFont = False
-    TabOrder = 3
+    TabOrder = 0
   end
   object Label27: TLabel
@@ -107 +107 @@
     Caption = 'OK'
     ModalResult = 1
-    TabOrder = 5
+    TabOrder = 6
   end
   object ButtonCancel: TButton
@@ -117 +117 @@
     Caption = 'Cancel'
     ModalResult = 2
-    TabOrder = 6
+    TabOrder = 5
   end
 end

trunk/Packages/Common/UCommon.pas

@@ -310 +310 @@
 end;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
 function GetUserName: string;
 const
@@ -318 +318 @@
 begin
   L := MAX_USERNAME_LENGTH + 2;
+  Result := Default(string);
   SetLength(Result, L);
   if Windows.GetUserName(PChar(Result), L) and (L > 0) then begin
@@ -331 +332 @@
   end;
 end;
-{$endif}
+{$ENDIF}
 
 function ComputerName: string;
-{$ifdef mswindows}
+{$IFDEF WINDOWS}
 const
  INFO_BUFFER_SIZE = 32767;
@@ -349 +350 @@
   end;
 end;
-{$endif}
-{$ifdef unix}
+{$ENDIF}
+{$IFDEF UNIX}
 var
   Name: UtsName;
@@ -358 +359 @@
   Result := Name.Nodename;
 end;
-{$endif}
-
-{$ifdef windows}
+{$ENDIF}
+
+{$IFDEF WINDOWS}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -438 +439 @@
 procedure LoadLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   DLLHandle1 := LoadLibrary('secur32.dll');
   if DLLHandle1 <> 0 then
@@ -449 +450 @@
 procedure FreeLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   if DLLHandle1 <> 0 then FreeLibrary(DLLHandle1);
   {$ENDIF}

trunk/UContact.pas

@@ -1724 +1724 @@
 begin
   Contacts.Clear;
-  MaxLineLength := 10;
+  //MaxLineLength := 10;
 
   I := 0;

trunk/UContactImage.pas

@@ -295 +295 @@
       if Url <> '' then begin
         Contact.Fields[FieldIndex] := Url;
+        PhotoProperty.Encoding := '';
       end else begin
         PhotoProperty.Encoding := VCardBase64;
@@ -322 +323 @@
   Url := '';
   Used := False;
+  Modified := True;
 end;
 
@@ -332 +334 @@
     Url := '';
     Used := True;
+    Modified := True;
   finally
     Free;

trunk/UCore.lfm

@@ -282 +282 @@
     AppName = 'vCard Studio'
     Description = 'vCard files management tool'
-    ReleaseDate = 44606
+    ReleaseDate = 44607
     RegistryKey = '\Software\Chronosoft\vCard Studio'
     RegistryRoot = rrKeyCurrentUser

trunk/vCardStudio.lpi

@@ -231 +231 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormNameDetails"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit20>