From 498fada9f0618d35e4ab77157f3481983c8cbab2 Mon Sep 17 00:00:00 2001 From: OH1KH Date: Wed, 9 Sep 2020 17:52:12 +0300 Subject: [PATCH] Added Ignore QSL feature to Labelprint and Automark QSL --- src/cqrlog.lpi | 1 + src/fExLabelPrint.pas | 10 ++++++++-- src/fMarkQSL.pas | 11 +++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/cqrlog.lpi b/src/cqrlog.lpi index a9d60e2..1109984 100644 --- a/src/cqrlog.lpi +++ b/src/cqrlog.lpi @@ -163,6 +163,7 @@ + diff --git a/src/fExLabelPrint.pas b/src/fExLabelPrint.pas index 1148928..5b2349b 100644 --- a/src/fExLabelPrint.pas +++ b/src/fExLabelPrint.pas @@ -62,7 +62,7 @@ var implementation {$R *.lfm} -uses dUtils, dData, uMyIni, fQSLExpPref, dDXCC,fMain; +uses dUtils, dData, uMyIni, fQSLExpPref, dDXCC,fMain, dLOgUpload; { TfrmExLabelPrint } procedure TfrmExLabelPrint.edtQSOsToLabelExit(Sender: TObject); @@ -427,6 +427,9 @@ begin exit end; + if cqrini.ReadBool('OnlineLog','IgnoreQSL',False) then + dmLogUpload.DisableOnlineLogSupport; + FieldCount := GetExpFieldCount; if dmData.DebugLevel >= 1 then Writeln('Field count: ', FieldCount); dmData.CreateQSLTmpTable; @@ -511,7 +514,10 @@ begin dmData.DropQSLTmpTable; lblProgress.Caption := 'Complete!'; CloseFile(f); - dmData.RefreshMainDatabase() + dmData.RefreshMainDatabase(); + + if cqrini.ReadBool('OnlineLog','IgnoreQSL',False) then + dmLogUpload.EnableOnlineLogSupport; end end; diff --git a/src/fMarkQSL.pas b/src/fMarkQSL.pas index 7331d43..db30606 100644 --- a/src/fMarkQSL.pas +++ b/src/fMarkQSL.pas @@ -46,7 +46,7 @@ var implementation {$R *.lfm} -uses dUtils, dData, dDXCC; +uses dUtils, dData, dDXCC, UMyIni, dLogUpload; procedure TfrmMarkQSL.FormShow(Sender: TObject); begin @@ -76,6 +76,10 @@ begin Application.MessageBox('First, you must filter QSO which you want to mark!','Info...',mb_ok+mb_IconInformation); exit end; + + if cqrini.ReadBool('OnlineLog','IgnoreQSL',False) then + dmLogUpload.DisableOnlineLogSupport; + if Pos('WHERE',tmp) = 0 then exit; tmp := copy(tmp,Pos('WHERE',tmp)+5,Length(tmp) - Pos('WHERE',tmp)); if pos('ORDER',tmp) > 0 then @@ -245,7 +249,10 @@ begin end; dmData.qCQRLOG.Next end; - lblProg.Caption := 'Complete!' + lblProg.Caption := 'Complete!'; + + if cqrini.ReadBool('OnlineLog','IgnoreQSL',False) then + dmLogUpload.EnableOnlineLogSupport; end; procedure TfrmMarkQSL.cmbTypeChange(Sender: TObject);