ADIF315: Added new columns

Addition of QSO Fields: - CNTY_ALT - DCL_QSLRDATE - DCL_QSLSDATE - DCL_QSL_RCVD - DCL_QSL_SENT - MORSE_KEY_INFO - MORSE_KEY_TYPE - MY_CNTY_ALT - MY_DARC_DOK - MY_MORSE_KEY_INFO - MY_MORSE_KEY_TYPE - QRZCOM_QSO_DOWNLOAD_DATE - QRZCOM_QSO_DOWNLOAD_STATUS - QSLMSG_RCVD
foldynl · Dec 22, 2024 · b46b865 · b46b865
1 parent 9db53aa
commit b46b865
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 16 deletions.
diff --git a/core/Migration.h b/core/Migration.h
@@ -42,7 +42,7 @@ class Migration : public QObject
     QString fixIntlField(QSqlQuery &query, const QString &columName, const QString &columnNameIntl);
     bool refreshUploadStatusTrigger();
 
-    static const int latestVersion = 31;
+    static const int latestVersion = 32;
 };
 
 #endif // QLOG_CORE_MIGRATION_H
diff --git a/data/Data.h b/data/Data.h
@@ -73,6 +73,20 @@ class Data : public QObject
         {"?", tr("Uncertain")},
         {" ", tr("Blank")}
     };
+    const QMap<QString, QString> morseKeyTypeEnum = {
+        {"SK", tr("Straight Key")},
+        {"SS", tr("Sideswiper")},
+        {"BUG", tr("Mechanical semi-automatic keyer or Bug")},
+        {"FAB", tr("Mechanical fully-automatic keyer or Bug")},
+        {"SP", tr("Single Paddle")},
+        {"DP", tr("Dual Paddle")},
+        {"CPU", tr("Computer Driven")},
+        };
+    const QMap<QString, QString> downloadStatusEnum = {
+        {"Y", tr("Yes")},
+        {"N", tr("No")},
+        {"I", tr("Invalid")}
+    };
 
     explicit Data(QObject *parent = nullptr);
     ~Data();

diff --git a/devtools/ADIF/all_ADIF_fields_example.adi b/devtools/ADIF/all_ADIF_fields_example.adi
@@ -152,4 +152,18 @@
 <VUCC_GRIDS:4>FN31
 <WEB:4>http://all.com
 <WWFF_REF:9>WWFF-OK11
+<CNTY_ALT:3>ALT
+<DCL_QSLRDATE:8>20240101
+<DCL_QSLSDATE:8>20240202
+<DCL_QSL_RCVD:1>I
+<DCL_QSL_SENT:1>Y
+<MORSE_KEY_INFO:4>TEST
+<MORSE_KEY_TYPE:3>CPU
+<MY_CNTY_ALT:3>ALT
+<MY_DARC_DOK:3>DOK
+<MY_MORSE_KEY_INFO:7>MY TEST
+<MY_MORSE_KEY_TYPE:2>DP
+<QRZCOM_QSO_DOWNLOAD_DATE:8>20240303
+<QRZCOM_QSO_DOWNLOAD_STATUS:1>Y
+<QSLMSG_RCVD:8>QSLR MSG
 <eor>
diff --git a/logformat/AdiFormat.cpp b/logformat/AdiFormat.cpp
@@ -286,6 +286,7 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("pfx", contact.take("pfx").toString().toUpper());
     record.setValue("state", contact.take("state"));
     record.setValue("cnty", contact.take("cnty"));
+    record.setValue("cnty_alt", contact.take("cnty_alt"));
     record.setValue("iota", contact.take("iota").toString().toUpper());
     record.setValue("qsl_rcvd", parseQslRcvd(contact.take("qsl_rcvd").toString()));
     record.setValue("qsl_rdate", parseDate(contact.take("qslrdate").toString()));  //TODO: DIFF MAPPING
@@ -321,6 +322,10 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("credit_submitted",contact.take("credit_submitted"));
     record.setValue("credit_granted",contact.take("credit_granted"));
     record.setValue("darc_dok",contact.take("darc_dok"));
+    record.setValue("dcl_qslrdate",parseDate(contact.take("dcl_qslrdate").toString()));
+    record.setValue("dcl_qslsdate",parseDate(contact.take("dcl_qslsdate").toString()));
+    record.setValue("dcl_qsl_rcvd",parseQslRcvd(contact.take("dcl_qsl_rcvd").toString()));
+    record.setValue("dcl_qsl_sent",parseQslSent(contact.take("dcl_qsl_sent").toString()));
     record.setValue("distance",contact.take("distance"));
     record.setValue("email",contact.take("email"));
     record.setValue("eq_call",contact.take("eq_call"));
@@ -345,6 +350,8 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("lat",contact.take("lat"));
     record.setValue("lon",contact.take("lon"));
     record.setValue("max_bursts",contact.take("max_bursts"));
+    record.setValue("morse_key_info",contact.take("morse_key_info"));
+    record.setValue("morse_key_type", parseMorseKeyType(contact.take("morse_key_type").toString()));
     record.setValue("ms_shower",contact.take("ms_shower"));
     record.setValue("my_antenna",contact.take("my_antenna"));
     record.setValue("my_antenna_intl",contact.take("my_antenna_intl"));
@@ -355,7 +362,9 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("my_country",contact.take("my_country"));
     record.setValue("my_country_intl",contact.take("my_country_intl"));
     record.setValue("my_cnty",contact.take("my_cnty"));
+    record.setValue("my_cnty_alt",contact.take("my_cnty_alt"));
     record.setValue("my_cq_zone",contact.take("my_cq_zone"));
+    record.setValue("my_darc_dok",contact.take("my_darc_dok"));
     record.setValue("my_dxcc",contact.take("my_dxcc"));
     record.setValue("my_fists",contact.take("my_fists"));
     record.setValue("my_gridsquare",contact.take("my_gridsquare").toString().toUpper());
@@ -365,6 +374,8 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("my_itu_zone",contact.take("my_itu_zone"));
     record.setValue("my_lat",contact.take("my_lat"));
     record.setValue("my_lon",contact.take("my_lon"));
+    record.setValue("my_morse_key_info",contact.take("my_morse_key_info"));
+    record.setValue("my_morse_key_type", parseMorseKeyType(contact.take("my_morse_key_type").toString()));
     record.setValue("my_name",contact.take("my_name"));
     record.setValue("my_name_intl",contact.take("my_name_intl"));
     record.setValue("my_postal_code",contact.take("my_postal_code"));
@@ -395,6 +406,8 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("precedence",contact.take("precedence"));
     record.setValue("prop_mode",contact.take("prop_mode"));
     record.setValue("public_key",contact.take("public_key"));
+    record.setValue("qrzcom_qso_download_date",parseDate(contact.take("qrzcom_qso_download_date").toString()));
+    record.setValue("qrzcom_qso_download_status",parseDownloadStatus(contact.take("qrzcom_qso_download_status").toString()));
     record.setValue("qrzcom_qso_upload_date",parseDate(contact.take("qrzcom_qso_upload_date").toString()));
     record.setValue("qrzcom_qso_upload_status",parseUploadStatus(contact.take("qrzcom_qso_upload_status").toString()));
     record.setValue("qsl_rcvd_via",contact.take("qsl_rcvd_via").toString().toUpper());
@@ -404,6 +417,7 @@ void AdiFormat::contactFields2SQLRecord(QMap<QString, QVariant> &contact, QSqlRe
     record.setValue("qso_random",contact.take("qso_random").toString().toUpper());
     record.setValue("qslmsg",contact.take("qslmsg"));
     record.setValue("qslmsg_intl",contact.take("qslmsg_intl"));
+    record.setValue("qslmsg_rcvd",contact.take("qslmsg_rcvd"));
     record.setValue("qth",contact.take("qth"));
     record.setValue("qth_intl",contact.take("qth_intl"));
     record.setValue("region",contact.take("region"));
@@ -724,6 +738,29 @@ QString AdiFormat::parseUploadStatus(const QString &value)
     return QString();
 }
 
+QString AdiFormat::parseDownloadStatus(const QString &value)
+{
+    FCT_IDENTIFICATION;
+
+    if ( value.isEmpty() )
+        return QString();
+
+    char firstChar = value.toUpper().at(0).toLatin1();
+
+    return ( firstChar == 'Y' || firstChar == 'N' || firstChar == 'I' ) ? QString(firstChar)
+                                                                        : QString();
+}
+
+QString AdiFormat::parseMorseKeyType(const QString &value)
+{
+    FCT_IDENTIFICATION;
+
+    static QList<QString> allowedValues({"SK", "SS", "BUG", "FAB", "SP", "DP", "CPU"});
+    const QString &inValue = value.toUpper();
+
+    return (allowedValues.contains(inValue)) ? inValue : QString();
+}
+
 
 QMap<QString, QString> AdiFormat::fieldname2INTLNameMapping =
 {
@@ -772,6 +809,7 @@ QHash<QString, AdiFormat::ExportParams> AdiFormat::DB2ADIFExportParams =
     { "pfx", ExportParams("pfx")},
     { "state", ExportParams("state")},
     { "cnty", ExportParams("cnty")},
+    { "cnty_alt", ExportParams("cnty_alt")},
     { "iota", ExportParams("iota", &AdiFormat::toUpper)},
     { "qsl_rcvd", ExportParams("qsl_rcvd")},
     { "qsl_rdate", ExportParams("qslrdate", &AdiFormat::toYYYYMMDD)},
@@ -803,6 +841,10 @@ QHash<QString, AdiFormat::ExportParams> AdiFormat::DB2ADIFExportParams =
     { "credit_submitted", ExportParams("credit_submitted")},
     { "credit_granted", ExportParams("credit_granted")},
     { "darc_dok", ExportParams("darc_dok")},
+    { "dcl_qslrdate", ExportParams("dcl_qslrdate", &AdiFormat::toYYYYMMDD)},
+    { "dcl_qslsdate", ExportParams("dcl_qslsdate", &AdiFormat::toYYYYMMDD)},
+    { "dcl_qsl_rcvd", ExportParams("dcl_qsl_rcvd")},
+    { "dcl_qsl_sent", ExportParams("dcl_qsl_sent")},
     { "distance", ExportParams("distance")},
     { "email", ExportParams("email")},
     { "eq_call", ExportParams("eq_call")},
@@ -827,14 +869,18 @@ QHash<QString, AdiFormat::ExportParams> AdiFormat::DB2ADIFExportParams =
     { "lat", ExportParams("lat")},
     { "lon", ExportParams("lon")},
     { "max_bursts", ExportParams("max_bursts")},
+    { "morse_key_info", ExportParams("morse_key_info")},
+    { "morse_key_type", ExportParams("morse_key_type", &AdiFormat::toUpper)},
     { "ms_shower", ExportParams("ms_shower")},
     { "my_altitude", ExportParams("my_altitude")},
     { "my_arrl_sect", ExportParams("my_arrl_sect")},
     { "my_antenna", ExportParams("my_antenna")},
     { "my_city", ExportParams("my_city")},
     { "my_cnty", ExportParams("my_cnty")},
+    { "my_cnty_alt", ExportParams("my_cnty_alt")},
     { "my_country", ExportParams("my_country")},
     { "my_cq_zone", ExportParams("my_cq_zone")},
+    { "my_darc_dok", ExportParams("my_darc_dok")},
     { "my_dxcc", ExportParams("my_dxcc")},
     { "my_fists", ExportParams("my_fists")},
     { "my_gridsquare", ExportParams("my_gridsquare")},
@@ -844,6 +890,8 @@ QHash<QString, AdiFormat::ExportParams> AdiFormat::DB2ADIFExportParams =
     { "my_itu_zone", ExportParams("my_itu_zone")},
     { "my_lat", ExportParams("my_lat")},
     { "my_lon", ExportParams("my_lon")},
+    { "my_morse_key_info", ExportParams("my_morse_key_info")},
+    { "my_morse_key_type", ExportParams("my_morse_key_type", &AdiFormat::toUpper)},
     { "my_name", ExportParams("my_name")},
     { "my_postal_code", ExportParams("my_postal_code")},
     { "my_pota_ref", ExportParams("my_pota_ref", &AdiFormat::toUpper)},
@@ -865,9 +913,12 @@ QHash<QString, AdiFormat::ExportParams> AdiFormat::DB2ADIFExportParams =
     { "precedence", ExportParams("precedence")},
     { "prop_mode", ExportParams("prop_mode")},
     { "public_key", ExportParams("public_key")},
+    { "qrzcom_qso_download_date", ExportParams("qrzcom_qso_download_date", &AdiFormat::toYYYYMMDD)},
+    { "qrzcom_qso_download_status", ExportParams("qrzcom_qso_download_status")},
     { "qrzcom_qso_upload_date", ExportParams("qrzcom_qso_upload_date", &AdiFormat::toYYYYMMDD)},
     { "qrzcom_qso_upload_status", ExportParams("qrzcom_qso_upload_status")},
     { "qslmsg", ExportParams("qslmsg")},
+    { "qslmsg_rcvd", ExportParams("qslmsg_rcvd")},
     { "qsl_rcvd_via", ExportParams("qsl_rcvd_via")},
     { "qsl_sent_via", ExportParams("qsl_sent_via")},
     { "qsl_via", ExportParams("qsl_via")},
@@ -898,3 +949,5 @@ QHash<QString, AdiFormat::ExportParams> AdiFormat::DB2ADIFExportParams =
     { "web", ExportParams("web")},
     { "wwff_ref", ExportParams("wwff_ref", &AdiFormat::toUpper)}
 };
+
+#undef ALWAYS_PRESENT
diff --git a/logformat/AdiFormat.h b/logformat/AdiFormat.h
@@ -2,8 +2,6 @@
 #define QLOG_LOGFORMAT_ADIFORMAT_H
 
 #include "LogFormat.h"
-#define ADIF_VERSION_STRING "3.1.4"
-#define PROGRAMID_STRING "QLog"
 
 class AdiFormat : public LogFormat
 {
@@ -69,6 +67,9 @@ class AdiFormat : public LogFormat
 
     static QHash<QString, AdiFormat::ExportParams> DB2ADIFExportParams;
 
+    const QString ADIF_VERSION_STRING = "3.1.5";
+    const QString PROGRAMID_STRING = "QLog";
+
 private:
 
     void readField(QString& field,
@@ -78,6 +79,8 @@ class AdiFormat : public LogFormat
     QString parseQslRcvd(const QString &value);
     QString parseQslSent(const QString &value);
     QString parseUploadStatus(const QString &value);
+    QString parseDownloadStatus(const QString &value);
+    QString parseMorseKeyType(const QString &value);
     enum ParserState {
         START,
         FIELD,

diff --git a/logformat/AdxFormat.cpp b/logformat/AdxFormat.cpp
@@ -78,8 +78,8 @@ void AdxFormat::exportStart()
     writer->writeStartElement("ADX");
 
     writer->writeStartElement("HEADER");
-    writer->writeTextElement("ADIF_VER", "3.1.4");
-    writer->writeTextElement("PROGRAMID", "QLog");
+    writer->writeTextElement("ADIF_VER", ADIF_VERSION_STRING);
+    writer->writeTextElement("PROGRAMID", PROGRAMID_STRING);
     writer->writeTextElement("PROGRAMVERSION", VERSION);
     writer->writeTextElement("CREATED_TIMESTAMP", date);
     writer->writeEndElement();

diff --git a/models/LogbookModel.cpp b/models/LogbookModel.cpp
@@ -32,7 +32,8 @@ QVariant LogbookModel::data(const QModelIndex &index, int role) const
 
     if (role == Qt::DecorationRole && (index.column() == COLUMN_QSL_RCVD || index.column() == COLUMN_QSL_SENT ||
                                        index.column() == COLUMN_LOTW_RCVD || index.column() == COLUMN_LOTW_SENT ||
-                                       index.column() == COLUMN_EQSL_QSL_RCVD || index.column() == COLUMN_EQSL_QSL_SENT))
+                                       index.column() == COLUMN_EQSL_QSL_RCVD || index.column() == COLUMN_EQSL_QSL_SENT ||
+                                       index.column() == COLUMN_DCL_QSL_RCVD || index.column() == COLUMN_DCL_QSL_SENT ))
     {
         QVariant value = QSqlTableModel::data(index, Qt::DisplayRole);
         if (value.toString() == "Y") {
@@ -600,6 +601,7 @@ QMap<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap
     {COLUMN_PREFIX, QT_TR_NOOP("Prefix")},
     {COLUMN_STATE, QT_TR_NOOP("State")},
     {COLUMN_COUNTY, QT_TR_NOOP("County")},
+    {COLUMN_CNTY_ALT, QT_TR_NOOP("County Alt")},
     {COLUMN_IOTA, QT_TR_NOOP("IOTA")},
     {COLUMN_QSL_RCVD, QT_TR_NOOP("QSLr")},
     {COLUMN_QSL_RCVD_DATE, QT_TR_NOOP("QSLr Date")},
@@ -636,6 +638,10 @@ QMap<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap
     {COLUMN_CREDIT_SUBMITTED, QT_TR_NOOP("Credit Submitted")},
     {COLUMN_CREDIT_GRANTED, QT_TR_NOOP("Credit Granted")},
     {COLUMN_DARC_DOK, QT_TR_NOOP("DOK")},
+    {COLUMN_DCL_QSLRDATE, QT_TR_NOOP("DCLr Date")},
+    {COLUMN_DCL_QSLSDATE, QT_TR_NOOP("DCLs Date")},
+    {COLUMN_DCL_QSL_RCVD, QT_TR_NOOP("DCLr")},
+    {COLUMN_DCL_QSL_SENT, QT_TR_NOOP("DCLs")},
     {COLUMN_DISTANCE, QT_TR_NOOP("Distance")},
     {COLUMN_EMAIL, QT_TR_NOOP("Email")},
     {COLUMN_EQ_CALL, QT_TR_NOOP("Owner Callsign")},
@@ -659,16 +665,20 @@ QMap<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap
     {COLUMN_LAT, QT_TR_NOOP("Latitude")},
     {COLUMN_LON, QT_TR_NOOP("Longitude")},
     {COLUMN_MAX_BURSTS, QT_TR_NOOP("Max Bursts")},
+    {COLUMN_MORSE_KEY_INFO, QT_TR_NOOP("Morse Key Info")},
+    {COLUMN_MORSE_KEY_TYPE, QT_TR_NOOP("Morse Key Type")},
     {COLUMN_MS_SHOWER, QT_TR_NOOP("MS Shower Name")},
     {COLUMN_MY_ALTITUDE, QT_TR_NOOP("My Altitude")},
     {COLUMN_MY_ANTENNA, QT_TR_NOOP("My Antenna (ASCII)")},
     {COLUMN_MY_ANTENNA_INTL, QT_TR_NOOP("My Antenna")},
     {COLUMN_MY_CITY, QT_TR_NOOP("My City (ASCII)")},
     {COLUMN_MY_CITY_INTL, QT_TR_NOOP("My City")},
     {COLUMN_MY_CNTY, QT_TR_NOOP("My County")},
+    {COLUMN_MY_CNTY_ALT, QT_TR_NOOP("My County Alt")},
     {COLUMN_MY_COUNTRY, QT_TR_NOOP("My Country (ASCII)")},
     {COLUMN_MY_COUNTRY_INTL, QT_TR_NOOP("My Country")},
     {COLUMN_MY_CQ_ZONE, QT_TR_NOOP("My CQZ")},
+    {COLUMN_MY_DARC_DOK, QT_TR_NOOP("My DARC DOK")},
     {COLUMN_MY_DXCC, QT_TR_NOOP("My DXCC")},
     {COLUMN_MY_FISTS, QT_TR_NOOP("My FISTS")},
     {COLUMN_MY_GRIDSQUARE, QT_TR_NOOP("My Gridsquare")},
@@ -678,6 +688,8 @@ QMap<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap
     {COLUMN_MY_ITU_ZONE, QT_TR_NOOP("My ITU")},
     {COLUMN_MY_LAT, QT_TR_NOOP("My Latitude")},
     {COLUMN_MY_LON, QT_TR_NOOP("My Longitude")},
+    {COLUMN_MY_MORSE_KEY_INFO, QT_TR_NOOP("My Morse Key Info")},
+    {COLUMN_MY_MORSE_KEY_TYPE, QT_TR_NOOP("My Morse Key Type")},
     {COLUMN_MY_NAME, QT_TR_NOOP("My Name (ASCII)")},
     {COLUMN_MY_NAME_INTL, QT_TR_NOOP("My Name")},
     {COLUMN_MY_POSTAL_CODE, QT_TR_NOOP("My Postal Code (ASCII)")},
@@ -706,10 +718,13 @@ QMap<LogbookModel::ColumnID, const char *> LogbookModel::fieldNameTranslationMap
     {COLUMN_PRECEDENCE, QT_TR_NOOP("Contest Precedence")},
     {COLUMN_PROP_MODE, QT_TR_NOOP("Propagation Mode")},
     {COLUMN_PUBLIC_KEY, QT_TR_NOOP("Public Encryption Key")},
+    {COLUMN_QRZCOM_QSO_DOWNLOAD_DATE, QT_TR_NOOP("QRZ Download Date")},
+    {COLUMN_QRZCOM_QSO_DOWNLOAD_STATUS, QT_TR_NOOP("QRZ Download Status")},
     {COLUMN_QRZCOM_QSO_UPLOAD_DATE, QT_TR_NOOP("QRZ Upload Date")},
     {COLUMN_QRZCOM_QSO_UPLOAD_STATUS, QT_TR_NOOP("QRZ Upload Status")},
-    {COLUMN_QSLMSG, QT_TR_NOOP("QSL Message (ASCII)")},
-    {COLUMN_QSLMSG_INTL, QT_TR_NOOP("QSL Message")},
+    {COLUMN_QSLMSG, QT_TR_NOOP("QSLs Message (ASCII)")},
+    {COLUMN_QSLMSG_INTL, QT_TR_NOOP("QSLs Message")},
+    {COLUMN_QSLMSG_RCVD, QT_TR_NOOP("QSLr Message")},
     {COLUMN_QSL_RCVD_VIA, QT_TR_NOOP("QSLr Via")},
     {COLUMN_QSL_SENT_VIA, QT_TR_NOOP("QSLs Via")},
     {COLUMN_QSL_VIA, QT_TR_NOOP("QSL Via")},

diff --git a/models/LogbookModel.h b/models/LogbookModel.h
@@ -184,7 +184,21 @@ class LogbookModel : public QSqlTableModel
         COLUMN_MY_GRIDSQUARE_EXT = 163,
         COLUMN_MY_POTA_REF = 164,
         COLUMN_POTA_REF = 165,
-        COLUMN_LAST_ELEMENT = 166
+        COLUMN_CNTY_ALT = 166,
+        COLUMN_DCL_QSLRDATE = 167,
+        COLUMN_DCL_QSLSDATE = 168,
+        COLUMN_DCL_QSL_RCVD = 169,
+        COLUMN_DCL_QSL_SENT = 170,
+        COLUMN_MORSE_KEY_INFO = 171,
+        COLUMN_MORSE_KEY_TYPE = 172,
+        COLUMN_MY_CNTY_ALT = 173,
+        COLUMN_MY_DARC_DOK = 174,
+        COLUMN_MY_MORSE_KEY_INFO = 175,
+        COLUMN_MY_MORSE_KEY_TYPE = 176,
+        COLUMN_QRZCOM_QSO_DOWNLOAD_DATE = 177,
+        COLUMN_QRZCOM_QSO_DOWNLOAD_STATUS = 178,
+        COLUMN_QSLMSG_RCVD = 179,
+        COLUMN_LAST_ELEMENT = 180
     };
 
 private:

diff --git a/res/sql/migration_032.sql b/res/sql/migration_032.sql
@@ -1 +1,16 @@
 UPDATE modes SET submodes = '["FMHELL", "FSKHELL", "HELL80", "HELLX5", "HELLX9", "HFSK", "PSKHELL", "SLOWHELL", "FSKH245", "FSKH105"]' WHERE name = 'HELL';
+
+ALTER TABLE contacts ADD cnty_alt TEXT;
+ALTER TABLE contacts ADD dcl_qslrdate TEXT;
+ALTER TABLE contacts ADD dcl_qslsdate TEXT;
+ALTER TABLE contacts ADD dcl_qsl_rcvd TEXT;
+ALTER TABLE contacts ADD dcl_qsl_sent TEXT;
+ALTER TABLE contacts ADD morse_key_info TEXT;
+ALTER TABLE contacts ADD morse_key_type TEXT;
+ALTER TABLE contacts ADD my_cnty_alt TEXT;
+ALTER TABLE contacts ADD my_darc_dok TEXT;
+ALTER TABLE contacts ADD my_morse_key_info TEXT;
+ALTER TABLE contacts ADD my_morse_key_type TEXT;
+ALTER TABLE contacts ADD qrzcom_qso_download_date TEXT;
+ALTER TABLE contacts ADD qrzcom_qso_download_status TEXT;
+ALTER TABLE contacts ADD qslmsg_rcvd TEXT;
diff --git a/ui/ColumnSettingDialog.cpp b/ui/ColumnSettingDialog.cpp
@@ -120,6 +120,10 @@ void ColumnSettingDialog::setupDialog()
         case LogbookModel::COLUMN_MY_USACA_COUNTIES:
         case LogbookModel::COLUMN_MY_VUCC_GRIDS:
         case LogbookModel::COLUMN_MY_WWFF_REF:
+        case LogbookModel::COLUMN_MY_CNTY_ALT:
+        case LogbookModel::COLUMN_MY_DARC_DOK:
+        case LogbookModel::COLUMN_MY_MORSE_KEY_INFO:
+        case LogbookModel::COLUMN_MY_MORSE_KEY_TYPE:
 
             myInfoCheckboxList.append(columnCheckbox);
             break;
@@ -151,6 +155,13 @@ void ColumnSettingDialog::setupDialog()
         case LogbookModel::COLUMN_HAMLOGEU_QSO_UPLOAD_STATUS:
         case LogbookModel::COLUMN_HAMQTH_QSO_UPLOAD_DATE:
         case LogbookModel::COLUMN_HAMQTH_QSO_UPLOAD_STATUS:
+        case LogbookModel::COLUMN_DCL_QSLRDATE:
+        case LogbookModel::COLUMN_DCL_QSLSDATE:
+        case LogbookModel::COLUMN_DCL_QSL_RCVD:
+        case LogbookModel::COLUMN_DCL_QSL_SENT:
+        case LogbookModel::COLUMN_QRZCOM_QSO_DOWNLOAD_DATE:
+        case LogbookModel::COLUMN_QRZCOM_QSO_DOWNLOAD_STATUS:
+        case LogbookModel::COLUMN_QSLMSG_RCVD:
             qslInfoCheckboxList.append(columnCheckbox);
             break;
 
@@ -201,7 +212,7 @@ void ColumnSettingDialog::setupDialog()
         case LogbookModel::COLUMN_RX_PWR:
         case LogbookModel::COLUMN_GRID_EXT:
         case LogbookModel::COLUMN_SIG:
-        case LogbookModel::COLUMN_SIG_INFO:
+        case LogbookModel::COLUMN_SIG_INFO:  
 
             otherInfoCheckboxList.append(columnCheckbox);
             break;