diff --git a/src/README-DEVEL b/src/README-DEVEL index 3920d24f..213961bc 100644 --- a/src/README-DEVEL +++ b/src/README-DEVEL @@ -142,7 +142,6 @@ Header fields: QSO fields: APP_KLOG_POINTS: Points given by the QSO. - APP_KLOG_MULTIPLIER: Information about the multiplier status of the QSO. APP_KLOG_LOGN: Lognumber if the ADIF file contains several logs. diff --git a/src/database.cpp b/src/database.cpp index b254ead4..2713d676 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -496,7 +496,6 @@ bool DataBase::createTableLog(bool temp) "freq VARCHAR, " "freq_rx VARCHAR, " "gridsquare VARCHAR, " - "guest_op VARCHAR," "hrdlog_qso_upload_date DATETIME, " "hrdlog_qso_upload_status VARCHAR(1), " "iota VARCHAR(6), " @@ -509,7 +508,6 @@ bool DataBase::createTableLog(bool temp) "lotw_qsl_rcvd VARCHAR(1), " "lotw_qsl_sent VARCHAR(1), " "max_bursts INTEGER, " - "multiplier INTEGER," "ms_shower VARCHAR, " "my_antenna VARCHAR," "my_city VARCHAR, " @@ -541,7 +539,6 @@ bool DataBase::createTableLog(bool temp) "operator VARCHAR, " "owner_callsign VARCHAR, " "pfx VARCHAR, " - "points INTEGER," "precedence VARCHAR, " "prop_mode VARCHAR, " "public_key VARCHAR, " @@ -585,7 +582,6 @@ bool DataBase::createTableLog(bool temp) "tx_pwr REAL, " "web VARCHAR, " "qso_date_off DATETIME, " //2020-01-01 - "transmiterid VARCHAR, " "marked VARCHAR(1), " "lognumber INTEGER NOT NULL, " @@ -3517,7 +3513,7 @@ bool DataBase::updateTableLog(const int _v) { case 6: // If 6, we copy in logtemp the full data coming from the old log. This way, the structure of // the log table is updated without any data loss. - queryString = QString ("INSERT INTO logtemp (qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, points, multiplier, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, transmiterid, marked, lognumber) SELECT qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, points, multiplier, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, transmiterid, marked, lognumber FROM log"); + queryString = QString ("INSERT INTO logtemp (qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, marked, lognumber) SELECT qso_date, call, rst_sent, rst_rcvd, bandid, modeid, srx, stx, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, band_rx, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, email, eq_call, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, iota, iota_island_id, k_index, lat, lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, max_bursts, ms_shower, my_city, my_cnty, my_country, my_cq_zone, my_gridsquare, my_iota, my_iota_island_id, my_lat, my_lon, my_name, my_rig, my_sig, my_sig_info, my_state, my_street, name, notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, srx_string, stx_string, state, station_callsign, swl, ten_ten, tx_pwr, web, qso_date_off, marked, lognumber FROM log"); break; default: //qDebug() << "DataBase::updateTableLog FALSE END" ; diff --git a/src/dataproxy_sqlite.cpp b/src/dataproxy_sqlite.cpp index d9e77dc3..bc308791 100644 --- a/src/dataproxy_sqlite.cpp +++ b/src/dataproxy_sqlite.cpp @@ -8710,34 +8710,6 @@ QString DataProxy_SQLite::getADIFQSO(const int _qsoId) ADIFqso.append("" + aux + " "); } } - nameCol = rec.indexOf("points"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - ADIFqso.append("" + aux + " "); - } - } - nameCol = rec.indexOf("multiplier"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - ADIFqso.append("" + aux + " "); - } - //qDebug() << "DataProxy_SQLite::getADIFQSO - 40"; - } - nameCol = rec.indexOf("transmiterid"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - ADIFqso.append("" + aux + " "); - } - } nameCol = rec.indexOf("country"); if (nameCol>=0) { @@ -8872,15 +8844,6 @@ QString DataProxy_SQLite::getADIFQSO(const int _qsoId) ADIFqso.append("" + aux + " "); } } - nameCol = rec.indexOf("guest_op"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - ADIFqso.append("" + aux + " "); - } - } nameCol = rec.indexOf("hrdlog_qso_upload_date"); if (nameCol>=0) { diff --git a/src/filemanager.cpp b/src/filemanager.cpp index 024c2510..404328dd 100644 --- a/src/filemanager.cpp +++ b/src/filemanager.cpp @@ -1877,7 +1877,7 @@ bool FileManager::adifReadLog(const QString& tfileName, const int logN) // START reading QSO data... //qDebug() << Q_FUNC_INFO << " QSO data reading started..." ; - preparedQuery.prepare( "INSERT INTO log (call, qso_date, bandid, modeid, srx, stx, srx_string, stx_string, qso_date_off, band_rx, rst_sent, rst_rcvd, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, eq_call, email, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, my_gridsquare, iota, iota_island_id, my_iota, my_iota_island_id, k_index, lat, lon, my_lat, my_lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, clublog_qso_upload_date, clublog_qso_upload_status, max_bursts, ms_shower, my_antenna, my_city, my_cnty, my_country, my_cq_zone, my_name, name, operator, station_callsign, owner_callsign, my_rig, my_sig, my_sig_info, my_sota_ref, my_state, state, my_street, my_vucc_grids, notes, nr_bursts, nr_pings, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, tx_pwr, sat_mode, sat_name, sfi, sig, sota_ref, swl, ten_ten, vucc_grids, web, points, multiplier, lognumber) VALUES (:call, :qso_date, :bandid, :modeid, :srx, :stx, :srx_string, :stx_string, :qso_date_off, :band_rx, :rst_sent, :rst_rcvd, :cqz, :ituz, :dxcc, :address, :age, :cnty, :comment, :a_index, :ant_az, :ant_el, :ant_path, :arrl_sect, :checkcontest, :class, :contacted_op, :contest_id, :country, :credit_submitted, :credit_granted, :distance, :eq_call, :email, :eqsl_qslrdate, :eqsl_qslsdate, :eqsl_qsl_rcvd, :eqsl_qsl_sent, :force_init, :freq, :freq_rx, :gridsquare, :my_gridsquare, :iota, :iota_island_id, :my_iota, :my_iota_island_id, :k_index, :lat, :lon, :my_lat, :my_lon, :lotw_qslrdate, :lotw_qslsdate, :lotw_qsl_rcvd, :lotw_qsl_sent, :clublog_qso_upload_date, :clublog_qso_upload_status, :max_bursts, :ms_shower, :my_antenna, :my_city, :my_cnty, :my_country, :my_cq_zone, :my_name, :name, :operator, :station_callsign, :owner_callsign, :my_rig, :my_sig, :my_sig_info, :my_sota_ref, :my_state, :state, :my_street, :my_vucc_grids, :notes, :nr_bursts, :nr_pings, :pfx, :precedence, :prop_mode, :public_key, :qslmsg, :qslrdate, :qslsdate, :qsl_rcvd, :qsl_sent, :qsl_rcvd_via, :qsl_sent_via, :qsl_via, :qso_complete, :qso_random, :qth, :rx_pwr, :tx_pwr, :sat_mode, :sat_name, :sfi, :sig, :sota_ref, :swl, :ten_ten, :vucc_grids, :web, :points, :multiplier, :lognumber)" ); + preparedQuery.prepare( "INSERT INTO log (call, qso_date, bandid, modeid, srx, stx, srx_string, stx_string, qso_date_off, band_rx, rst_sent, rst_rcvd, cqz, ituz, dxcc, address, age, cnty, comment, a_index, ant_az, ant_el, ant_path, arrl_sect, checkcontest, class, contacted_op, contest_id, country, credit_submitted, credit_granted, distance, eq_call, email, eqsl_qslrdate, eqsl_qslsdate, eqsl_qsl_rcvd, eqsl_qsl_sent, force_init, freq, freq_rx, gridsquare, my_gridsquare, iota, iota_island_id, my_iota, my_iota_island_id, k_index, lat, lon, my_lat, my_lon, lotw_qslrdate, lotw_qslsdate, lotw_qsl_rcvd, lotw_qsl_sent, clublog_qso_upload_date, clublog_qso_upload_status, max_bursts, ms_shower, my_antenna, my_city, my_cnty, my_country, my_cq_zone, my_name, name, operator, station_callsign, owner_callsign, my_rig, my_sig, my_sig_info, my_sota_ref, my_state, state, my_street, my_vucc_grids, notes, nr_bursts, nr_pings, pfx, precedence, prop_mode, public_key, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, qth, rx_pwr, tx_pwr, sat_mode, sat_name, sfi, sig, sota_ref, swl, ten_ten, vucc_grids, web, lognumber) VALUES (:call, :qso_date, :bandid, :modeid, :srx, :stx, :srx_string, :stx_string, :qso_date_off, :band_rx, :rst_sent, :rst_rcvd, :cqz, :ituz, :dxcc, :address, :age, :cnty, :comment, :a_index, :ant_az, :ant_el, :ant_path, :arrl_sect, :checkcontest, :class, :contacted_op, :contest_id, :country, :credit_submitted, :credit_granted, :distance, :eq_call, :email, :eqsl_qslrdate, :eqsl_qslsdate, :eqsl_qsl_rcvd, :eqsl_qsl_sent, :force_init, :freq, :freq_rx, :gridsquare, :my_gridsquare, :iota, :iota_island_id, :my_iota, :my_iota_island_id, :k_index, :lat, :lon, :my_lat, :my_lon, :lotw_qslrdate, :lotw_qslsdate, :lotw_qsl_rcvd, :lotw_qsl_sent, :clublog_qso_upload_date, :clublog_qso_upload_status, :max_bursts, :ms_shower, :my_antenna, :my_city, :my_cnty, :my_country, :my_cq_zone, :my_name, :name, :operator, :station_callsign, :owner_callsign, :my_rig, :my_sig, :my_sig_info, :my_sota_ref, :my_state, :state, :my_street, :my_vucc_grids, :notes, :nr_bursts, :nr_pings, :pfx, :precedence, :prop_mode, :public_key, :qslmsg, :qslrdate, :qslsdate, :qsl_rcvd, :qsl_sent, :qsl_rcvd_via, :qsl_sent_via, :qsl_via, :qso_complete, :qso_random, :qth, :rx_pwr, :tx_pwr, :sat_mode, :sat_name, :sfi, :sig, :sota_ref, :swl, :ten_ten, :vucc_grids, :web, :lognumber)" ); /* if (db.transaction()) { @@ -2260,7 +2260,6 @@ void FileManager::initializeSwitchHash() { {"FREQ", 49}, {"FREQ_RX", 50}, {"GRIDSQUARE", 51}, - {"GUEST_OP", 52}, {"HRDLOG_QSO_UPLOAD_DATE", 53}, {"HRDLOG_QSO_UPLOAD_STATUS", 54}, {"MY_GRIDSQUARE", 55}, @@ -2343,8 +2342,6 @@ void FileManager::initializeSwitchHash() { {"VE_PROV", 132}, {"VUCC_GRIDS", 133}, {"WEB", 134}, - {"APP_KLOG_POINTS", 135}, - {"APP_KLOG_MULTIPLIER", 136}, {"APP_KLOG_TRX", 137}, {"APP_KLOG_LOGN", 138}, {"APP_N1MM_POINTS", 139} @@ -2802,9 +2799,6 @@ bool FileManager::processQsoReadingADIF(const QStringList &_line, const int logN case(51): preparedQuery.bindValue(":gridsquare", data); break; - case(52): - preparedQuery.bindValue(":guest_op", data); - break; case(53): dateT = util->getDateFromADIFDateString(data); if (dateT.isValid()) @@ -3155,15 +3149,6 @@ bool FileManager::processQsoReadingADIF(const QStringList &_line, const int logN case(134): preparedQuery.bindValue(":web", data); break; - case(135): //Importing own ADIF fields - preparedQuery.bindValue(":points", data); - break; - case(136): //Importing own ADIF fields - preparedQuery.bindValue(":multiplier", data); - break; - case(137): //Importing own ADIF fields - preparedQuery.bindValue(":transmiterid", data); - break; case(138): //Lognumber in a multiple-log file //TODO: Think about how to import a file with different logs @@ -4398,34 +4383,6 @@ void FileManager::writeQuery(QSqlQuery query, QTextStream &out, const ExportMode out << "" << aux << " "; } } - nameCol = rec.indexOf("points"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - out << "" << aux << " "; - } - } - nameCol = rec.indexOf("multiplier"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - out << "" << aux << " "; - } - //qDebug() << "FileManager::writeQuery - 40"; - } - nameCol = rec.indexOf("transmiterid"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - out << "" << aux << " "; - } - } nameCol = rec.indexOf("country"); if (nameCol>=0) { @@ -4560,15 +4517,6 @@ void FileManager::writeQuery(QSqlQuery query, QTextStream &out, const ExportMode out << "" << aux << " "; } } - nameCol = rec.indexOf("guest_op"); - if (nameCol>=0) - { - aux = (query.value(nameCol)).toString(); aux = util->checkAndFixASCIIinADIF(aux); - if ((aux.length())>0) - { - out << "" << aux << " "; - } - } nameCol = rec.indexOf("hrdlog_qso_upload_date"); if (nameCol>=0) { diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c62e026d..9582ef85 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -3407,7 +3407,7 @@ void MainWindow::slotOpenWiki() { logEvent(Q_FUNC_INFO, "Start", Debug); //qDebug() << Q_FUNC_INFO ; - QDesktopServices::openUrl(QUrl("https://wiki.klog.xyz/")); + QDesktopServices::openUrl(QUrl("https://github.com/ea4k/klog/wiki/")); logEvent(Q_FUNC_INFO, "END", Debug); } diff --git a/src/qso.cpp b/src/qso.cpp index 00ed0b95..fcee177d 100644 --- a/src/qso.cpp +++ b/src/qso.cpp @@ -2642,7 +2642,6 @@ void QSO::InitializeHash() { {"FREQ", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setFreqTX)}, {"FREQ_RX", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setFreqRX)}, {"GRIDSQUARE", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setGridSquare)}, - {"GUEST_OP", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setOperatorCallsign)}, {"HRDLOG_QSO_UPLOAD_DATE", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setHRDUpdateDate)}, {"HRDLOG_QSO_UPLOAD_STATUS", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setHRDLogStatus)}, {"IOTA", decltype(std::mem_fn(&QSO::decltype_function))(&QSO::setIOTA)}, @@ -2830,7 +2829,7 @@ QString QSO::getAddQueryString() " my_itu_zone, my_lat, " "my_lon, my_name, my_postal_code, my_rig, my_sig, my_sig_info, my_sota_ref, my_state, my_street, " "my_usaca_counties, my_vucc_grids, name, " - "notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, points, precedence, prop_mode, public_key, qrzcom_qso_upload_date, " + "notes, nr_bursts, nr_pings, operator, owner_callsign, pfx, precedence, prop_mode, public_key, qrzcom_qso_upload_date, " "qrzcom_qso_upload_status, qslmsg, qslrdate, qslsdate, qsl_rcvd, qsl_sent, qsl_rcvd_via, qsl_sent_via, qsl_via, qso_complete, qso_random, " "qth, region, rig, rx_pwr, sat_mode, sat_name, sfi, sig, sig_info, silent_key, skcc, sota_ref, srx_string, srx, stx_string, stx, state, " "station_callsign, submode, swl, uksmg, usaca_counties, ve_prov, vucc_grids, ten_ten, tx_pwr, web, qso_date_off, marked, lognumber) " @@ -2843,7 +2842,7 @@ QString QSO::getAddQueryString() ":iota, :iota_island_id, :k_index, :lat, :lon, :lotw_qslrdate, :lotw_qslsdate, :lotw_qsl_rcvd, :lotw_qsl_sent, :max_bursts, :ms_shower, " ":my_antenna, :my_city, :my_cnty, :my_country, :my_cq_zone, :my_dxcc, :my_fists, :my_gridsquare, :my_iota, :my_iota_island_id, :my_itu_zone, :my_lat, " ":my_lon, :my_name, :my_postal_code, :my_rig, :my_sig, :my_sig_info, :my_sota_ref, :my_state, :my_street, :my_usaca_counties, :my_vucc_grids, :name, " - ":notes, :nr_bursts, :nr_pings, :operator, :owner_callsign, :pfx, :points, :precedence, :prop_mode, :public_key, :qrzcom_qso_upload_date, " + ":notes, :nr_bursts, :nr_pings, :operator, :owner_callsign, :pfx, :precedence, :prop_mode, :public_key, :qrzcom_qso_upload_date, " ":qrzcom_qso_upload_status, :qslmsg, :qslrdate, :qslsdate, :qsl_rcvd, :qsl_sent, :qsl_rcvd_via, :qsl_sent_via, :qsl_via, :qso_complete, :qso_random, " ":qth, :region, :rig, :rx_pwr, :sat_mode, :sat_name, :sfi, :sig, :sig_info, :silent_key, :skcc, :sota_ref, :srx_string, :srx, :stx_string, :stx, :state," ":station_callsign, :submode, :swl, :uksmg, :usaca_counties, :ve_prov, :vucc_grids, :ten_ten, :tx_pwr, :web, :qso_date_off, " @@ -2875,7 +2874,7 @@ QString QSO::getModifyQueryString() "my_sota_ref = :my_sota_ref, my_state = :my_state, my_street = :my_street, " "my_usaca_counties = :my_usaca_counties, my_vucc_grids = :my_vucc_grids, name = :name, notes = :notes, " "nr_bursts = :nr_bursts, nr_pings = :nr_pings, operator = :operator, owner_callsign = :owner_callsign, " - "pfx = :pfx, points = :points, precedence = :precedence, prop_mode = :prop_mode, " + "pfx = :pfx, precedence = :precedence, prop_mode = :prop_mode, " "public_key = :public_key, qrzcom_qso_upload_date = :qrzcom_qso_upload_date, " "qrzcom_qso_upload_status = :qrzcom_qso_upload_status, qslmsg = :qslmsg, qslrdate = :qslrdate, " "qslsdate = :qslsdate, qsl_rcvd = :qsl_rcvd, qsl_sent = :qsl_sent, qsl_rcvd_via = :qsl_rcvd_via, " diff --git a/src/startwizard.cpp b/src/startwizard.cpp index b3695a3d..7ad917d9 100644 --- a/src/startwizard.cpp +++ b/src/startwizard.cpp @@ -154,7 +154,7 @@ QString welcometxt = "" + tr("Welcome to KLog") + "" + "

" + tr("This looks like it's the first time you've run KLog on this computer.") + "

" + - "

" + tr("KLog is a free hamradio logging program that can run on GNU/Linux, macOS, and Windows.") + + "

" + tr("KLog is a free hamradio logging program that can run on GNU/Linux, macOS, and Windows. ") + tr("It is designed to provide general purpose DX, and contest logging.") + "

" + "

" + tr("It supports QSL management, import and export of ADIF ") + tr("and Cabrillo file formats and many other features...") + "

" + diff --git a/src/translations/klog_ca.ts b/src/translations/klog_ca.ts index aa141916..c1bb7c9e 100644 --- a/src/translations/klog_ca.ts +++ b/src/translations/klog_ca.ts @@ -5155,11 +5155,6 @@ El KLog finalitzarà quan feu clic a D'acord. Max Bursts Màx ràfegues - - - Multiplier - Multiplicador - MS Shower @@ -5300,11 +5295,6 @@ El KLog finalitzarà quan feu clic a D'acord. Pfx Pfx - - - Points - Punts - Precedence @@ -5496,11 +5486,6 @@ El KLog finalitzarà quan feu clic a D'acord. QSO Date off Data fi QSO - - - Transmitter id - ID transmissor - Log number diff --git a/src/translations/klog_cs.ts b/src/translations/klog_cs.ts index 1316498e..04ed01c3 100644 --- a/src/translations/klog_cs.ts +++ b/src/translations/klog_cs.ts @@ -5125,11 +5125,6 @@ KLog se ukončí po stisknutí OK. Max Bursts - - - Multiplier - - MS Shower @@ -5466,11 +5461,6 @@ KLog se ukončí po stisknutí OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_da.ts b/src/translations/klog_da.ts index 98f1fd22..5c0a9dd1 100644 --- a/src/translations/klog_da.ts +++ b/src/translations/klog_da.ts @@ -5076,11 +5076,6 @@ KLog will finish when you click on OK. Max Bursts - - - Multiplier - - MS Shower @@ -5417,11 +5412,6 @@ KLog will finish when you click on OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_de.ts b/src/translations/klog_de.ts index 55dd8c8f..e9f6b76b 100644 --- a/src/translations/klog_de.ts +++ b/src/translations/klog_de.ts @@ -5050,11 +5050,6 @@ KLog will finish when you click on OK. Max Bursts - - - Multiplier - - MS Shower @@ -5391,11 +5386,6 @@ KLog will finish when you click on OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_es.ts b/src/translations/klog_es.ts index 63e52421..ebf7e2a0 100644 --- a/src/translations/klog_es.ts +++ b/src/translations/klog_es.ts @@ -5154,11 +5154,6 @@ KLog finalizará cuando pulse sobre OK. Max Bursts max ráfagas - - - Multiplier - Multiplicador - MS Shower @@ -5495,11 +5490,6 @@ KLog finalizará cuando pulse sobre OK. QSO Date off Fecha fin QSO - - - Transmitter id - Id transmisor - Log number diff --git a/src/translations/klog_fi.ts b/src/translations/klog_fi.ts index efd99ad3..546536a2 100644 --- a/src/translations/klog_fi.ts +++ b/src/translations/klog_fi.ts @@ -5092,11 +5092,6 @@ KLog will finish when you click on OK. Max Bursts - - - Multiplier - - MS Shower @@ -5433,11 +5428,6 @@ KLog will finish when you click on OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_fr.ts b/src/translations/klog_fr.ts index 26fc673c..727a366a 100644 --- a/src/translations/klog_fr.ts +++ b/src/translations/klog_fr.ts @@ -5077,11 +5077,6 @@ KLog will finish when you click on OK. Max Bursts - - - Multiplier - - MS Shower @@ -5418,11 +5413,6 @@ KLog will finish when you click on OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_hr.ts b/src/translations/klog_hr.ts index b68e9d23..17aa97a8 100644 --- a/src/translations/klog_hr.ts +++ b/src/translations/klog_hr.ts @@ -5121,11 +5121,6 @@ KLog će izaći kad kliknete na OK. Max Bursts - - - Multiplier - - MS Shower @@ -5462,11 +5457,6 @@ KLog će izaći kad kliknete na OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_it.ts b/src/translations/klog_it.ts index dad26520..ad0e00c2 100644 --- a/src/translations/klog_it.ts +++ b/src/translations/klog_it.ts @@ -5129,11 +5129,6 @@ KLog terminerà appena cliccherai su OK. Max Bursts Burst Max - - - Multiplier - Moltiplicatore - MS Shower @@ -5470,11 +5465,6 @@ KLog terminerà appena cliccherai su OK. QSO Date off QSO Date spenta - - - Transmitter id - Id trasmettitore - Log number diff --git a/src/translations/klog_ja.ts b/src/translations/klog_ja.ts index d804b87f..8016945b 100644 --- a/src/translations/klog_ja.ts +++ b/src/translations/klog_ja.ts @@ -5093,11 +5093,6 @@ OKをクリックすると、KLogが終了します。 Max Bursts - - - Multiplier - - MS Shower @@ -5434,11 +5429,6 @@ OKをクリックすると、KLogが終了します。 QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_lv.ts b/src/translations/klog_lv.ts index f8532ded..eeb9cfe2 100644 --- a/src/translations/klog_lv.ts +++ b/src/translations/klog_lv.ts @@ -4972,11 +4972,6 @@ KLog will finish when you click on OK. Max Bursts - - - Multiplier - - MS Shower @@ -5348,11 +5343,6 @@ KLog will finish when you click on OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_pl.ts b/src/translations/klog_pl.ts index 0ca7f206..f77e197a 100644 --- a/src/translations/klog_pl.ts +++ b/src/translations/klog_pl.ts @@ -5029,11 +5029,6 @@ KLog will finish when you click on OK. Max Bursts - - - Multiplier - - MS Shower @@ -5370,11 +5365,6 @@ KLog will finish when you click on OK. QSO Date off - - - Transmitter id - - Log number diff --git a/src/translations/klog_uk.ts b/src/translations/klog_uk.ts index 34ef57cc..4114bdea 100644 --- a/src/translations/klog_uk.ts +++ b/src/translations/klog_uk.ts @@ -5010,11 +5010,6 @@ KLog завершить роботу, коли Ви натиснете кноп Max Bursts - - - Multiplier - - MS Shower @@ -5386,11 +5381,6 @@ KLog завершить роботу, коли Ви натиснете кноп QSO Date off - - - Transmitter id - - Log number diff --git a/src/utilities.cpp b/src/utilities.cpp index f69d6666..1ac7e827 100644 --- a/src/utilities.cpp +++ b/src/utilities.cpp @@ -1804,7 +1804,6 @@ void Utilities::setLogColumnNames() columnNames.insert("freq", QObject::tr("Freq")); columnNames.insert("freq_rx", QObject::tr("Freq RX")); columnNames.insert("gridsquare", QObject::tr("Gridsquare")); - columnNames.insert("guest_op", QObject::tr("Guest OP")); columnNames.insert("hrdlog_qso_upload_date", QObject::tr("HRDLog SDate")); columnNames.insert("hrdlog_qso_upload_status", QObject::tr("HRDLog status")); columnNames.insert("iota", QObject::tr("IOTA")); @@ -1817,7 +1816,6 @@ void Utilities::setLogColumnNames() columnNames.insert("lotw_qsl_rcvd", QObject::tr("LoTW Rcvd")); columnNames.insert("lotw_qsl_sent", QObject::tr("LoTW Sent")); columnNames.insert("max_bursts", QObject::tr("Max Bursts")); - columnNames.insert("multiplier", QObject::tr("Multiplier")); columnNames.insert("ms_shower", QObject::tr("MS Shower")); columnNames.insert("my_antenna", QObject::tr("My Antenna")); columnNames.insert("my_city", QObject::tr("My City")); @@ -1849,7 +1847,6 @@ void Utilities::setLogColumnNames() columnNames.insert("operator", QObject::tr("Operator")); columnNames.insert("owner_callsign", QObject::tr("Owner Callsign")); columnNames.insert("pfx", QObject::tr("Pfx")); - columnNames.insert("points", QObject::tr("Points")); columnNames.insert("precedence", QObject::tr("Precedence")); columnNames.insert("prop_mode", QObject::tr("Prop Mode")); columnNames.insert("public_key", QObject::tr("Public Key")); @@ -1892,7 +1889,6 @@ void Utilities::setLogColumnNames() columnNames.insert("tx_pwr", QObject::tr("TX Pwr")); columnNames.insert("web", QObject::tr("Web")); columnNames.insert("qso_date_off", QObject::tr("QSO Date off")); - columnNames.insert("transmiterid", QObject::tr("Transmitter id")); columnNames.insert("lognumber", QObject::tr("Log number")); } QString Utilities::getLogColumnName(const QString &_column) @@ -1998,8 +1994,6 @@ QString Utilities::getLogColumnName(const QString &_column) return QObject::tr("Freq RX"); else if (_column == "gridsquare") return QObject::tr("Gridsquare"); - else if (_column == "guest_op") - return QObject::tr("Guest OP"); else if (_column == "hrdlog_qso_upload_date") return QObject::tr("HRDLog SDate"); else if (_column == "hrdlog_qso_upload_status") @@ -2024,8 +2018,6 @@ QString Utilities::getLogColumnName(const QString &_column) return QObject::tr("LoTW Sent"); else if (_column == "max_bursts") return QObject::tr("Max Bursts"); - else if (_column == "multiplier") - return QObject::tr("Multiplier"); else if (_column == "ms_shower") return QObject::tr("MS Shower"); else if (_column == "my_antenna") @@ -2088,8 +2080,6 @@ QString Utilities::getLogColumnName(const QString &_column) return QObject::tr("Owner Callsign"); else if (_column == "pfx") return QObject::tr("Pfx"); - else if (_column == "points") - return QObject::tr("Points"); else if (_column == "precedence") return QObject::tr("Precedence"); else if (_column == "prop_mode") @@ -2174,8 +2164,6 @@ QString Utilities::getLogColumnName(const QString &_column) return QObject::tr("Web"); else if (_column == "qso_date_off") return QObject::tr("QSO Date off"); - else if (_column == "transmiterid") - return QObject::tr("Transmitter id"); else if (_column == "lognumber") return QObject::tr("Log number"); else