Queueing or not the eQSL is done based on the config

ea4k · Feb 5, 2021 · 5063596 · 5063596
1 parent 703c333
commit 5063596
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/dataproxy_sqlite.cpp b/dataproxy_sqlite.cpp
@@ -2273,7 +2273,7 @@ bool DataProxy_SQLite::clublogModifyFullLog(const int _currentLog)
                       const QString &_comment,
                       const QString &_stationcallsign, const QString &_name, const QString &_operator,
                       const QDateTime &_datetime, const QDateTime &_datetime_off, const double txpower,
-                      const int _dxcc, const int _logNumber)
+                      const int _dxcc, const int _logNumber, bool _sendQSL)
 {
     //qDebug() << "DataProxy_SQLite::addQSOFromWSJTX: " << _dxcall << endl;
 
@@ -2462,21 +2462,24 @@ bool DataProxy_SQLite::clublogModifyFullLog(const int _currentLog)
 
     stringFields  = stringFields  + "qsl_via, ";
     stringData =  stringData + "'B', ";
+    if (_sendQSL)
+    {
+        stringFields  = stringFields  + "lotw_qsl_sent, ";
+        stringData =  stringData + "'Q', ";
 
-    stringFields  = stringFields  + "lotw_qsl_sent, ";
-    stringData =  stringData + "'Q', ";
+        stringFields  = stringFields  + "eqsl_qsl_sent, ";
+        stringData =  stringData + "'Q', ";
 
-    stringFields  = stringFields  + "eqsl_qsl_sent, ";
-    stringData =  stringData + "'Q', ";
+        stringFields  = stringFields  + "hrdlog_qso_upload_status, ";
+        stringData =  stringData + "'M', ";
 
-    stringFields  = stringFields  + "hrdlog_qso_upload_status, ";
-    stringData =  stringData + "'M', ";
+        stringFields  = stringFields  + "clublog_qso_upload_status, ";
+        stringData =  stringData + "'M', ";
 
-    stringFields  = stringFields  + "clublog_qso_upload_status, ";
-    stringData =  stringData + "'M', ";
+        stringFields  = stringFields  + "qrzcom_qso_upload_status, ";
+        stringData =  stringData + "'M', ";
+    }
 
-    stringFields  = stringFields  + "qrzcom_qso_upload_status, ";
-    stringData =  stringData + "'M', ";
 
     stringFields  = stringFields  + "lognumber";
     stringData =  stringData + "'" + QString::number(_logNumber) + "'";

diff --git a/dataproxy_sqlite.h b/dataproxy_sqlite.h
@@ -104,7 +104,7 @@ class DataProxy_SQLite : public QObject
                           const QString &_comment,
                           const QString &_stationcallsign, const QString &_name, const QString &_operator,
                           const QDateTime &_datetime, const QDateTime &_datetime_off, const double txpower,
-                          const int _dxcc, const int _logNumber);
+                          const int _dxcc, const int _logNumber, bool _sendQSL = true);
 
     int addQSOFromLoTW(const QString &_call, const QDateTime _datetime, const QString &_mode, const QString &_band, const double _freq, const QDate _qslrdate, const QString &_stationcallsign, const int _logn);
     int addQSO(QSO &_qso);

diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -44,7 +44,7 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
     softwareVersion = tversion;
     klogDir = _klogDir;
     logSeverity = 7;
-
+    sendQSLByDefault = true; // This must be before reading the config
     needToEnd = false;
     upAndRunning = false; // To define some actions that can only be run when starting the software
 
@@ -5068,7 +5068,8 @@ bool MainWindow::processConfigLine(const QString &_line){
     */
     else if (field=="SENDEQSLBYDEFAULT")
     {
-        eQSLTabWidget->setQueueSentByDefault(util->trueOrFalse(value));
+        sendQSLByDefault = util->trueOrFalse(value);
+        eQSLTabWidget->setQueueSentByDefault(sendQSLByDefault);
     }
     else if (field=="COMPLETEWITHPREVIOUS")
     {

diff --git a/mainwindow.h b/mainwindow.h
@@ -374,6 +374,8 @@ private slots:
     bool hamlibChangingMode;
     bool hamlibModeNotADIFSupported;
 
+    bool sendQSLByDefault;
+
     // PST Rotator
     //PSTRotatorSupport *pstRotator;
     //bool usePSTRotator;