Changeset 63

Timestamp:

Dec 9, 2021, 11:17:22 PM (2 years ago)

Author:

chronos

Message:

• Fixed: Open directory with saved split contact files in default file manager under Linux.
• Fixed: Don't use forbidden characters in saved contact file name.

Location:

trunk

Files:

• Forms/UFormContacts.pas (modified) (1 diff)
• UContact.pas (modified) (2 diffs)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)

trunk/Forms/UFormContacts.pas

@@ -414 +414 @@
     end;
     SaveDialog1.InitialDir := ExtractFileDir(Core.LastContactFileName);
-    SaveDialog1.FileName := TContact(ListView1.Selected.Data).Fields[cfFullName] +
+    SaveDialog1.FileName := TContact(ListView1.Selected.Data).FullNameToFileName +
       VCardFileExt;
     if SaveDialog1.Execute then begin

trunk/UContact.pas

@@ -110 +110 @@
     Properties: TContactProperties;
     Parent: TContactsFile;
+    function FullNameToFileName: string;
     function GetProperty(Field: TContactField): TContactProperty; overload;
     function GetProperty(FieldIndex: TContactFieldIndex): TContactProperty; overload;
@@ -728 +729 @@
 end;
 
+function TContact.FullNameToFileName: string;
+var
+  I: Integer;
+begin
+  Result := Fields[cfFullName];
+  for I := 1 to Length(Result) do begin
+    if Result[I] in [':', '/', '\', '.', '"', '*', '|', '?', '<', '>'] then
+      Result[I] := '_';
+  end;
+end;
+
 function TContact.GetProperty(Field: TContactField): TContactProperty;
 var

trunk/UCore.lfm

@@ -506 +506 @@
     AppName = 'vCard Studio'
     Description = 'vCard files management tool'
-    ReleaseDate = 44524
+    ReleaseDate = 44539
     RegistryKey = '\Software\Chronosoft\vCard Studio'
     RegistryRoot = rrKeyCurrentUser

trunk/UCore.pas

@@ -198 +198 @@
       if Items[I].Fields[cfFullName] <> '' then begin
         FileName := SelectDirectoryDialog1.FileName + DirectorySeparator +
-          Items[I].Fields[cfFullName] + VCardFileExt;
+          Items[I].FullNameToFileName + VCardFileExt;
         Items[I].SaveToFile(FileName);
         Inc(C);
@@ -209 +209 @@
       {$IFDEF WINDOWS}
       ExecuteProgram('explorer.exe', ['"' + SelectDirectoryDialog1.FileName + '"']);
+      {$ENDIF}
+      {$IFDEF LINUX}
+      ExecuteProgram('/usr/bin/xdg-open', [SelectDirectoryDialog1.FileName]);
       {$ENDIF}
     end;
@@ -525 +528 @@
   AFileSplit.Enabled := Assigned(DataFile);
   AFileMerge.Enabled := Assigned(DataFile);
+  AFindDuplicate.Enabled := Assigned(DataFile);
+  AGenerate.Enabled := Assigned(DataFile);
 end;