Changeset 153

Timestamp:

Jun 6, 2023, 9:46:08 PM (11 months ago)

Author:

chronos

Message:

• Added: Accept dropped files onto the application form.
• Fixed: Report error if compare tool was not found.

Location:

trunk

Files:

• Core.pas (modified) (3 diffs)
• Forms/FormCompare.pas (modified) (2 diffs)
• Forms/FormMain.lfm (modified) (2 diffs)
• Forms/FormMain.pas (modified) (3 diffs)
• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.pot (modified) (2 diffs)
• Languages/vCardStudio.sv.po (modified) (2 diffs)

trunk/Core.pas

@@ -83 +83 @@
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
-    procedure UpdateFile;
     procedure LoadConfig;
     procedure SaveConfig;
@@ -107 +106 @@
     DefaultInternationalCallPrefix: string;
     CompareTool: string;
+    procedure UpdateFile;
     function GetProfileImage: TImage;
     function GetTempDir: string;
@@ -130 +130 @@
 uses
   FormMain, FormSettings, FormFindDuplicity, FormCompare, TestCase, FormNormalize,
-  FormGenerate, FormError, FormFind, FormTest, FormSource, FormCompareSideBySide,
-  TestCases;
+  FormGenerate, FormError, FormFind, FormTest, FormSource, TestCases;
 
 resourcestring

trunk/Forms/FormCompare.pas

@@ -44 +44 @@
 uses
   Core, FormCompareSideBySide, VCardProcessor;
+
+resourcestring
+  SCompareToolNotFound = 'Compare tool ''%s'' not found. Select valid compare tool in the application settings.';
 
 { TFormCompare }
@@ -150 +153 @@
   SaveStringToFile(TextLeft, TempFileLeft);
   SaveStringToFile(TextRight, TempFileRight);
-  ExecuteProgram(Core.Core.CompareTool, [TempFileLeft, TempFileRight]);
+  if FileExists(Core.Core.CompareTool) then
+    ExecuteProgram(Core.Core.CompareTool, [TempFileLeft, TempFileRight])
+    else ShowMessage(Format(SCompareToolNotFound, [Core.Core.CompareTool]));
 end;
 
 procedure TFormCompare.CompareExternal;
 begin
-  CompareText(LeftVCard.VCard.AsString, RightVCard.Vcard.AsString,
+  CompareText(LeftVCard.VCard.AsString, RightVCard.VCard.AsString,
     ExtractFileName(LeftVCard.FileName), ExtractFileName(EditAnotherFile.Text));
 end;

trunk/Forms/FormMain.lfm

@@ -4 +4 @@
   Top = 401
   Width = 1178
+  AllowDropFiles = True
   Caption = 'vCard Studio'
   ClientHeight = 762
@@ -13 +14 @@
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnDropFiles = FormDropFiles
   OnResize = FormResize
   OnShow = FormShow

trunk/Forms/FormMain.pas

@@ -59 +59 @@
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure FormDropFiles(Sender: TObject; const FileNames: array of string);
     procedure FormResize(Sender: TObject);
     procedure FormShow(Sender: TObject);
@@ -85 +86 @@
 resourcestring
   SModified = 'Modified';
+  SOnlyOneFileCanBeDropped = 'Only one file can be dropped at once.';
 
 { TFormMain }
@@ -111 +113 @@
 begin
   FreeAndNil(FormContacts);
+end;
+
+procedure TFormMain.FormDropFiles(Sender: TObject;
+  const FileNames: array of string);
+begin
+  if Length(FileNames) <> 1 then ShowMessage(SOnlyOneFileCanBeDropped)
+    else begin
+      Core.Core.FileOpen(FileNames[0]);
+      Core.Core.UpdateFile;
+    end;
 end;
 

trunk/Languages/vCardStudio.cs.po

@@ -57 +57 @@
 msgstr "Odstraněno %d duplikátů."
 
+#: formcompare.scomparetoolnotfound
+#, object-pascal-format
+msgid "Compare tool '%s' not found. Select valid compare tool in the application settings."
+msgstr "Nástroj porovnání '%s' nebyl nalezen. Vyberte platný nástroj porovnání v nastavení aplikace."
+
 #: formcontact.scontact
 msgctxt "formcontact.scontact"
@@ -117 +122 @@
 msgstr "Upraveno"
 
+#: formmain.sonlyonefilecanbedropped
+msgid "Only one file can be dropped at once."
+msgstr "Pouze jeden soubor může být položen najednou."
+
 #: formproperties.sendupdatetoolow
 msgctxt "formproperties.sendupdatetoolow"

trunk/Languages/vCardStudio.pot

@@ -47 +47 @@
 msgstr ""
 
+#: formcompare.scomparetoolnotfound
+#, object-pascal-format
+msgid "Compare tool '%s' not found. Select valid compare tool in the application settings."
+msgstr ""
+
 #: formcontact.scontact
 msgctxt "formcontact.scontact"
@@ -107 +112 @@
 msgstr ""
 
+#: formmain.sonlyonefilecanbedropped
+msgid "Only one file can be dropped at once."
+msgstr ""
+
 #: formproperties.sendupdatetoolow
 msgctxt "formproperties.sendupdatetoolow"

trunk/Languages/vCardStudio.sv.po

@@ -58 +58 @@
 msgstr ""
 
+#: formcompare.scomparetoolnotfound
+#, object-pascal-format
+msgid "Compare tool '%s' not found. Select valid compare tool in the application settings."
+msgstr ""
+
 #: formcontact.scontact
 msgctxt "formcontact.scontact"
@@ -118 +123 @@
 msgstr "Redigerade"
 
+#: formmain.sonlyonefilecanbedropped
+msgid "Only one file can be dropped at once."
+msgstr ""
+
 #: formproperties.sendupdatetoolow
 msgctxt "formproperties.sendupdatetoolow"