Changeset 30 for trunk/UCore.pas

Timestamp:

Nov 24, 2021, 8:42:24 PM (3 years ago)

Author:

chronos

Message:

• Added: In case of loading errors show a list of found errors with line numbers.
• Fixed: Check if property block started correctly.
• Added: More standard properties.
• Fixed: Improved alignment of fields in contact dialog.

File:

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

trunk/UCore.pas

@@ -68 +68 @@
     InitializeStarted: Boolean;
     InitializeFinished: Boolean;
+    LoadErrors: string;
     procedure FileModified(Sender: TObject);
     function FindFirstNonOption: string;
@@ -73 +74 @@
     procedure LoadConfig;
     procedure SaveConfig;
+    procedure DoError(Text: string; Line: Integer);
   public
     DefaultDataFileClass: TDataFileClass;
@@ -97 +99 @@
 uses
   UFormMain, UFormSettings, UContact, UFormContacts, UFormFindDuplicity,
-  UFormGenerate;
+  UFormGenerate, UFormError;
 
 resourcestring
@@ -104 +106 @@
   SFileNotFound = 'File ''%s'' not found.';
   SMergedContacts = 'Contacts merged. Loaded: %d, New: %d, Updated: %d';
+  SLine = 'Line %d: %s';
 
 { TMergeResult }
@@ -310 +313 @@
     if FileClosed then begin
       FileNew;
+      LoadErrors := '';
       DataFile.LoadFromFile(FileName);
       LastOpenedList1.AddItem(FileName);
+      if LoadErrors <> '' then begin
+        FormError := TFormError.Create(nil);
+        FormError.MemoErrors.Text := LoadErrors;
+        FormError.ShowModal;
+        FreeAndNil(FormError);
+      end;
     end;
   end else ShowMessage(Format(SFileNotFound, [FileName]));
@@ -379 +389 @@
     DataFile := DefaultDataFileClass.Create;
     DataFile.OnModify := FileModified;
+    TContactsFile(DataFile).OnError := DoError;
   end;
 end;
@@ -437 +448 @@
 end;
 
+procedure TCore.DoError(Text: string; Line: Integer);
+begin
+  LoadErrors := LoadErrors + Format(SLine, [Line, Text]) + LineEnding;
+end;
+
 procedure TCore.UpdateInterface;
 begin