Changeset 151 for trunk/Core.pas

Timestamp:

Jun 6, 2023, 11:15:57 AM (18 months ago)

Author:

chronos

Message:

• Added: New file compare dialog with additional normalize options.
• Modified: Compare action uses external compare tool.

File:

• trunk/Core.pas (modified) (10 diffs)

trunk/Core.pas

@@ -7 +7 @@
   LastOpenedList, ApplicationInfo, PersistentForm, ScaleDPI, Common,
   Translator, DataFile, VCard, Menus, RegistryEx, Theme, AboutDialog,
-  Registry;
+  Registry, VCardFile;
 
 type
@@ -87 +87 @@
     procedure AddItemToLastOpenedList(FileName: string);
     procedure DoDataFileChange;
+    function GetDefaultCompareTool: string;
   public
     DefaultDataFileClass: TDataFileClass;
@@ -94 +95 @@
     LastContactTabIndex: Integer;
     LastContactFileName: string;
-    LastCompareFileName: string;
     LastPhotoFileName: string;
     LastQrCodeFileName: string;
@@ -102 +102 @@
     ToolbarVisible: Boolean;
     DefaultVcardVersion: string;
+    DefaultPhoneCountryPrefix: string;
+    CompareTool: string;
     function GetProfileImage: TImage;
+    function GetTempDir: string;
     procedure FileNew;
     procedure FileOpen(FileName: string);
@@ -123 +126 @@
 
 uses
-  FormMain, FormSettings, FormFindDuplicity, TestCase,
-  FormGenerate, FormError, FormFind, FormTest, FormSource, FormCompare,
-  TestCases, VCardFile;
+  FormMain, FormSettings, FormFindDuplicity, FormCompare, TestCase,
+  FormGenerate, FormError, FormFind, FormTest, FormSource, FormCompareSideBySide,
+  TestCases;
 
 resourcestring
@@ -184 +187 @@
 procedure TCore.AFileCompareExecute(Sender: TObject);
 var
-  TempFile: TDataFile;
-  TempFileName: string;
-begin
-  TempFile := DefaultDataFileClass.Create(nil);
-  try
-    OpenDialog1.Filter := TempFile.GetFileFilter;
-  finally
-    TempFile.Free;
-  end;
-  OpenDialog1.DefaultExt := '';
-  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
-      TempFileName := GetTempDir + DirectorySeparator + Application.Title +
-        DirectorySeparator + 'Compare' + VCardFileExt;
-      ForceDirectories(ExtractFileDir(TempFileName));
-      TVCardFile(DataFile).SaveToFile(TempFileName);
-      LoadFileLeft(TempFileName);
-      LoadFileRight(OpenDialog1.FileName);
-      ShowModal;
-    finally
-      Free;
-    end;
-    Core.LastCompareFileName := OpenDialog1.FileName;
+  FormCompare: TFormCompare;
+begin
+  FormCompare := TFormCompare.Create(nil);
+  try
+    FormCompare.ShowModal;
+  finally
+    FreeAndNil(FormCompare);
   end;
 end;
@@ -556 +539 @@
     LastPhotoFileName := ReadStringWithDefault('LastPhotoFileName', '');
     LastQrCodeFileName := ReadStringWithDefault('LastQrCodeFileName', '');
-    LastCompareFileName := ReadStringWithDefault('LastCompareFileName', '');
+    CompareTool := ReadStringWithDefault('CompareTool', GetDefaultCompareTool);
+    DefaultPhoneCountryPrefix := ReadStringWithDefault('DefaultPhoneCountryPrefix', DefaultPhoneCountryPrefix);
   finally
     Free;
@@ -583 +567 @@
     WriteString('LastPhotoFileName', LastPhotoFileName);
     WriteString('LastQrCodeFileName', LastQrCodeFileName);
-    WriteString('LastCompareFileName', LastCompareFileName);
+    WriteString('CompareTool', CompareTool);
+    WriteString('DefaultPhoneCountryPrefix', DefaultPhoneCountryPrefix);
   finally
     Free;
@@ -609 +594 @@
 end;
 
+function TCore.GetDefaultCompareTool: string;
+const
+  KDiff3 = '/usr/bin/kdiff3';
+  Kompare = '/usr/bin/kompare';
+  Meld = '/usr/bin/meld';
+  Diffuse = '/usr/bin/diffuse';
+  BeyondCompare = '/usr/bin/bcompare';
+begin
+  if FileExists(KDiff3) then Result := KDiff3
+  else if FileExists(Meld) then Result := Meld
+  else if FileExists(Kompare) then Result := Kompare
+  else if FileExists(Diffuse) then Result := Diffuse
+  else if FileExists(BeyondCompare) then Result := BeyondCompare
+  else Result := '';
+end;
+
 function TCore.GetProfileImage: TImage;
 begin
@@ -617 +618 @@
   end;
   Result := ProfileImage;
+end;
+
+function TCore.GetTempDir: string;
+begin
+  Result := SysUtils.GetTempDir + Application.Title;
 end;