Changeset 121 for trunk/UCore.pas

Timestamp:

Feb 22, 2022, 11:07:27 AM (3 years ago)

Author:

chronos

Message:

• Modified: Improved compare dialog to show text compare of vcard data.
• Modified: Both compare sides now have scrollbar synced.
• Modified: Compare panels keep horizontal size ratio during window resize.

File:

• trunk/UCore.pas (modified) (5 diffs)

trunk/UCore.pas

@@ -88 +88 @@
     LastContactTabIndex: Integer;
     LastContactFileName: string;
+    LastCompareFileName: string;
     LastPhotoFileName: string;
     LastPropertyValueFileName: string;
@@ -171 +172 @@
 var
   TempFile: TDataFile;
-  LeftContacts: TContactsFile;
-  RightContacts: TContactsFile;
+  TempFileName: string;
 begin
   TempFile := DefaultDataFileClass.Create;
@@ -181 +181 @@
   end;
   OpenDialog1.DefaultExt := '';
-  if Assigned(DataFile) then begin
-    OpenDialog1.InitialDir := ExtractFileDir(DataFile.FileName);
-    OpenDialog1.FileName := ExtractFileName(DataFile.FileName);
-  end;
+  OpenDialog1.InitialDir := ExtractFileDir(Core.LastCompareFileName);
+  OpenDialog1.FileName := ExtractFileName(Core.LastCompareFileName);
   OpenDialog1.Options := OpenDialog1.Options - [ofAllowMultiSelect];
   if OpenDialog1.Execute then begin
     with TFormCompare.Create(nil) do
     try
-      LeftContacts := TContactsFile(DefaultDataFileClass.Create);
-      RightContacts := TContactsFile(DefaultDataFileClass.Create);
-      try
-        LeftContacts.Assign(TContactsFile(DataFile));
-        LeftSide := LeftContacts;
-        RightContacts.LoadFromFile(OpenDialog1.FileName);
-        RightSide := RightContacts;
-        ShowModal;
-      finally
-        LeftContacts.Free;
-        RightContacts.Free;
-      end;
+      TempFileName := GetTempDir + DirectorySeparator + Application.Title +
+        DirectorySeparator + 'Compare' + VCardFileExt;
+      ForceDirectories(ExtractFileDir(TempFileName));
+      TContactsFile(DataFile).SaveToFile(TempFileName);
+      LoadFileLeft(TempFileName);
+      LoadFileRight(OpenDialog1.FileName);
+      ShowModal;
     finally
       Free;
     end;
+    Core.LastCompareFileName := OpenDialog1.FileName;
   end;
 end;
@@ -532 +526 @@
     MapUrl := ReadStringWithDefault('MapUrl', 'https://www.openstreetmap.org/search?query=');
     LastPhotoFileName := ReadStringWithDefault('LastPhotoFileName', '');
+    LastCompareFileName := ReadStringWithDefault('LastCompareFileName', '');
   finally
     Free;
@@ -558 +553 @@
     WriteString('MapUrl', MapUrl);
     WriteString('LastPhotoFileName', LastPhotoFileName);
+    WriteString('LastCompareFileName', LastCompareFileName);
   finally
     Free;