Merge branch 'master' into squash_wsjt_alm

help/h3.html

@@ -60,14 +60,14 @@
     However the user can choose to override a MY_GRIDSQUARE from ADIF file by selecting the checkbox.
     In this case MY_GRIDSQUARE from the ADIF file is overriden by the locator from the selected profile 
     or if no profile is selected the default locator from the config is used.<br><br>
-    <img src="img/h42.png" border="0"><p>
+    <img src="img/h42.png" border="0"> <img src="img/h42b.png" border="0"><p>
     The  window now shows the import completion, the number of imported records and
     the number of errors. If the ADIF file contains incorrect entries, they will be stored
     separately in the file <strong>errors_HH_MM_SS.adi</strong> located in the user's home folder.
     You can open, import or delete the file by pointing the name with left mouse click.</p><p>
     If you plan to import fixed error file you have to fix every qso record line at point(s) the ERROR: -line(s) show. 
     After fixing a qso record you must delete corresponding ERROR: -line(s).<br>
-    Text editor to use must be defined at preferences/External viewers.<br>
+    Text editor to use must be defined at preferences/External viewers. If reimported error file still has errors you can delete it from popup menu and continue with new error file.<br>
     <strong>NOTE:</strong> If you change tag text you have to check the length of text that is after tag name, before text itself, as <strong>:xx&gt;</strong> where
     xx is the count of characters in tag string.
     <i><br><br>

src/fAdifImport.lfm

@@ -339,7 +339,6 @@ object frmAdifImport: TfrmAdifImport
       Visible = False
       OnClick = lblErrorLogClick
       OnMouseEnter = lblErrorLogMouseEnter
-      OnMouseLeave = lblErrorLogMouseLeave
     end
     object btnImport: TButton
       AnchorSideTop.Control = lbFile
@@ -383,6 +382,7 @@ object frmAdifImport: TfrmAdifImport
       BorderSpacing.Bottom = 6
       Caption = 'Close'
       ModalResult = 2
+      OnClick = btnCloseClick
       TabOrder = 2
     end
     object chkFilterDateRange: TCheckBox
@@ -530,4 +530,25 @@ object frmAdifImport: TfrmAdifImport
     Left = 280
     Top = 144
   end
+  object popErrFile: TPopupMenu
+    Left = 320
+    Top = 144
+    object mnuedit: TMenuItem
+      Caption = 'Open with text editor'
+      OnClick = mnueditClick
+    end
+    object mnuImport: TMenuItem
+      Caption = 'Adif import file'
+      OnClick = mnuImportClick
+    end
+    object mnuDelImport: TMenuItem
+      Caption = 'Delete imported Err file'
+      Visible = False
+      OnClick = mnuDelImportClick
+    end
+    object mnuDelete: TMenuItem
+      Caption = 'Delete file'
+      OnClick = mnuDeleteClick
+    end
+  end
 end

src/fAdifImport.pas

@@ -115,6 +115,7 @@ type
     lblDateTo: TLabel;
     lblQthProfile: TLabel;
     lblRemaks: TLabel;
+    mnuDelImport: TMenuItem;
     mnuedit: TMenuItem;
     mnuImport: TMenuItem;
     mnuDelete: TMenuItem;
@@ -127,19 +128,21 @@ type
     Q4: TSQLQuery;
     sb: TStatusBar;
     tr: TSQLTransaction;
+    procedure btnCloseClick(Sender: TObject);
     procedure chkFilterDateRangeChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure btnImportClick(Sender: TObject);
     procedure lblErrorLogClick(Sender: TObject);
     procedure lblErrorLogMouseEnter(Sender: TObject);
-    procedure lblErrorLogMouseLeave(Sender: TObject);
     procedure mnuDeleteClick(Sender: TObject);
+    procedure mnuDelImportClick(Sender: TObject);
     procedure mnueditClick(Sender: TObject);
     procedure mnuImportClick(Sender: TObject);
   private
     AbortImport : boolean;
     ERR_FILE : String;
+    Do_Err_Import : Boolean;
     CutErrText : String;
     WrongRecNr : Integer;
     RecNR      : Integer;
@@ -772,6 +775,7 @@ var
   ErrText : String = '';
   tmp : String='';
 begin
+  if lblFileName.Caption='' then exit;
   CutErrText :='';
   AbortImport := false;
   lblComplete.Visible := False;
@@ -881,12 +885,22 @@ begin
 end;
 
 procedure TfrmAdifImport.mnuImportClick(Sender: TObject);
+var
+  tmp:Char;
 begin
   popErrFile.Close;
+  try
+    tmp := FormatSettings.TimeSeparator;
+    FormatSettings.TimeSeparator := '_';
+    ERR_FILE := 'errors_'+TimeToStr(now)+'.adi'
+  finally
+    FormatSettings.TimeSeparator := tmp
+  end;
   lblFileName.Caption:= lblErrorLog.Caption;
   lblErrorLog.Caption:='';
   lblCount.Caption :='';
-  lblErrors.Caption := ''
+  lblErrors.Caption := '';
+  Do_Err_Import:=true;
 end;
 
 procedure TfrmAdifImport.mnuDeleteClick(Sender: TObject);
@@ -899,17 +913,23 @@ begin
     end;
 end;
 
+procedure TfrmAdifImport.mnuDelImportClick(Sender: TObject);
+begin
+    popErrFile.Close;
+     if ( Application.MessageBox(pAnsiChar('Do you want to delete file'+#10+lblFileName.Caption) , 'Delete file ?',MB_ICONQUESTION + MB_YESNO) = IDYES) then
+    Begin
+      DeleteFile(lblFileName.Caption);
+      Do_Err_Import:=false;
+      lblFileName.Caption:=''
+    end;
+end;
+
 procedure TfrmAdifImport.lblErrorLogMouseEnter(Sender: TObject);
 begin
-     lblErrorLog.Font.Bold:=true;
+     mnuDelImport.Visible:=Do_Err_Import;
+     popErrFile.Popup;
 end;
 
-procedure TfrmAdifImport.lblErrorLogMouseLeave(Sender: TObject);
-begin
-  lblErrorLog.Font.Bold:=false;
-end;
-
-
 function TfrmAdifImport.ValidateFilter: boolean;
 begin
   Result := true;
@@ -931,6 +951,7 @@ procedure TfrmAdifImport.FormCreate(Sender: TObject);
 var
   tmp : Char;
 begin
+  Do_Err_Import:=false;
   NowDate := dmUtils.MyDateToStr(now);
 
   Q1.DataBase := dmData.MainCon;
@@ -958,6 +979,11 @@ begin
   lblFilteredOutCount.Visible := chkFilterDateRange.Checked;
 end;
 
+procedure TfrmAdifImport.btnCloseClick(Sender: TObject);
+begin
+  AbortImport:=true;
+end;
+
 procedure TfrmAdifImport.FormShow(Sender: TObject);
 begin
   lblComplete.Visible := False;