From 62dcf6958add6fc2fd382b4513a5c704606a25c9 Mon Sep 17 00:00:00 2001 From: ea4k Date: Wed, 18 Aug 2021 17:52:51 +0200 Subject: [PATCH] It compiles now --- src/klogconfig.cpp | 20 +- src/main.cpp | 2 +- src/mainwindow.cpp | 282 ++++++++++++++--------------- src/setuppages/setuppagehamlib.cpp | 7 +- 4 files changed, 148 insertions(+), 163 deletions(-) diff --git a/src/klogconfig.cpp b/src/klogconfig.cpp index 90bf1155..f1ffbdfb 100644 --- a/src/klogconfig.cpp +++ b/src/klogconfig.cpp @@ -41,7 +41,7 @@ KlogConfig::~KlogConfig() bool KlogConfig::old2newMigrationSuccess() { - qDebug() << "KlogConfig::old2newMigrationSuccess - START" << endl; + qDebug() << "KlogConfig::old2newMigrationSuccess - START" << Qt::endl; QString oldconfig = Utilities::getHomeDir() + #if defined(Q_OS_WIN) @@ -52,7 +52,7 @@ bool KlogConfig::old2newMigrationSuccess() if (!QFile::exists(oldconfig)) { - qDebug() << "KlogConfig::old2newMigrationSuccess - " << oldconfig << " does not exists - END" << endl; + qDebug() << "KlogConfig::old2newMigrationSuccess - " << oldconfig << " does not exists - END" << Qt::endl; //old config does not exists return false; } @@ -60,7 +60,7 @@ bool KlogConfig::old2newMigrationSuccess() QFile file(oldconfig); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { - qDebug() << "KlogConfig::old2newMigrationSuccess - " << oldconfig << " cannot open - END" << endl; + qDebug() << "KlogConfig::old2newMigrationSuccess - " << oldconfig << " cannot open - END" << Qt::endl; //cannot open file return false; } @@ -77,13 +77,13 @@ bool KlogConfig::old2newMigrationSuccess() file.close(); - qDebug() << "KlogConfig::old2newMigrationSuccess - END" << endl; + qDebug() << "KlogConfig::old2newMigrationSuccess - END" << Qt::endl; return true; } void KlogConfig::processOldConfigLine(const QString &_line) { - qDebug() << "KlogConfig::ProcessOldConfigLine - ["<< _line << "] - START" << endl; + qDebug() << "KlogConfig::ProcessOldConfigLine - ["<< _line << "] - START" << Qt::endl; QString line = _line.simplified(); @@ -99,7 +99,7 @@ void KlogConfig::processOldConfigLine(const QString &_line) QStringList config_values; config_values.clear(); - config_values << line.split("=", QString::SkipEmptyParts); + config_values << line.split("=", Qt::SkipEmptyParts); if (config_values.length() != 2) { @@ -110,7 +110,7 @@ void KlogConfig::processOldConfigLine(const QString &_line) QString config_value = config_values.at(1); config_value = config_value.remove(";"); - qDebug() << "KlogConfig::ProcessOldConfigLine [1:" << field << ", 2:" << config_value << "]" << endl; + qDebug() << "KlogConfig::ProcessOldConfigLine [1:" << field << ", 2:" << config_value << "]" << Qt::endl; if (field == "CALLSIGN") setValue("userdata/callsign", config_value.toUpper()); else if (field == "OPERATORS") setValue("userdata/operators", config_value); @@ -134,8 +134,8 @@ void KlogConfig::processOldConfigLine(const QString &_line) else if (field == "ANTENNA1") setValue("userdata/antenna1", config_value); else if (field == "ANTENNA2") setValue("userdata/antenna2", config_value); else if (field == "ANTENNA3") setValue("userdata/antenna3", config_value); - else if (field == "MODES") setValue("userdata/modes", config_value.split(", ", QString::SkipEmptyParts)); - else if (field == "BANDS") setValue("userdata/bands", config_value.split(", ", QString::SkipEmptyParts)); + else if (field == "MODES") setValue("userdata/modes", config_value.split(", ", Qt::SkipEmptyParts)); + else if (field == "BANDS") setValue("userdata/bands", config_value.split(", ", Qt::SkipEmptyParts)); else if (field == "REALTIME" // generic false / true mapping || field == "USEDEFAULTNAME" || field == "IMPERIALSYSTEM" @@ -222,7 +222,7 @@ void KlogConfig::processOldConfigLine(const QString &_line) setValue(field.toLower(), config_value); } - qDebug() << "KlogConfig::ProcessOldConfigLine - END" << endl; + qDebug() << "KlogConfig::ProcessOldConfigLine - END" << Qt::endl; return; } diff --git a/src/main.cpp b/src/main.cpp index 1181bcf2..c59540b5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) //qDebug() << "KLog Main: " << QSslSocket::supportsSsl() << QSslSocket::sslLibraryBuildVersionString() << QSslSocket::sslLibraryVersionString() << Qt::endl; QT_REQUIRE_VERSION(argc, argv, "5.15") QDir d1 = QDir(); - QString version = "1.8"; + QString version = "1.8.1"; //qDebug() << "KLog Main STARTED: " << version << Qt::endl; //Utilities util = Utilities(); QStringList arguments; diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 753b10c3..958ac658 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -221,6 +221,17 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion) //qDebug() << "MainWindow::MainWindow: END " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; } +MainWindow::~MainWindow() +{ + logEvent(Q_FUNC_INFO, "Start", logSeverity); + + if (hamlibActive) + { + hamlib->stop(); + } + logEvent(Q_FUNC_INFO, "KLog exit", Info); +} + void MainWindow::saveWindowsSize() { //qDebug() << "MainWindow::saveWindows" << Qt::endl; @@ -475,7 +486,6 @@ void MainWindow::init() //qDebug() << "MainWindow::init: END" << Qt::endl; } - void MainWindow::createActionsCommon(){ // Functional widgets connections //TODO: Reimplement the possibility to enter a QSO with enter inthe following widgets: @@ -635,8 +645,6 @@ void MainWindow::createActionsCommon(){ } - - void MainWindow::recommendBackupIfNeeded() { //qDebug() << "MainWindow::recommendBackupIfNeeded" << Qt::endl; @@ -726,19 +734,6 @@ void MainWindow::checkIfNewVersion() //qDebug() << "MainWindow::checkIfNewVersion - END" << Qt::endl; } -MainWindow::~MainWindow() -{ - logEvent(Q_FUNC_INFO, "Start", logSeverity); - - if (hamlibActive) - { - hamlib->stop(); - } - logEvent(Q_FUNC_INFO, "KLog exit", Info); -} - - - void MainWindow::createStatusBar() { logEvent(Q_FUNC_INFO, "Start", logSeverity); @@ -746,14 +741,6 @@ void MainWindow::createStatusBar() logEvent(Q_FUNC_INFO, "END", logSeverity); } -/* -void MainWindow::slotWorldMapShow() -{ - //worldMapWidget->resize(500,300); - //worldMapWidget->loadMap(); - worldMapWidget->show(); -} -*/ void MainWindow::setMainWindowTitle(const QString &_s) { QString aux = dataProxy->getCommentsFromLog(currentLog); @@ -766,8 +753,6 @@ void MainWindow::setMainWindowTitle(const QString &_s) { setWindowTitle(tr("KLog - %1 - QSOs: %2" ).arg(stationQRZ).arg(_s)); } - - } void MainWindow::createUI() @@ -796,7 +781,6 @@ void MainWindow::slotTimeOutInfoBars() logEvent(Q_FUNC_INFO, "END", logSeverity); } - void MainWindow::setModeFromFreq() { //TODO: define frequency ranges for the different modes @@ -909,7 +893,6 @@ void MainWindow::slotModeChanged (const QString &_m) //qDebug() << "MainWindow::slotModeComboBoxChanged2: " << mainQSOEntryWidget->getMode() << Qt::endl; } - void MainWindow::slotQRZReturnPressed() { logEvent(Q_FUNC_INFO, "Start", logSeverity); @@ -2772,6 +2755,7 @@ void MainWindow::slotQRZcomUpload(QList _id) //qDebug() << "MainWindow::slotQRZcomUpload - END" << Qt::endl; } + void MainWindow::slotQSOsDelete(QList _id) { //qDebug() << "MainWindow::slotQSOsDelete " << QString::number(_id.length()) << Qt::endl; @@ -3040,7 +3024,6 @@ void MainWindow::slotElogClubLogProcessAnswer(const int _i, const int _qID) logEvent(Q_FUNC_INFO, "END", logSeverity); } - void MainWindow::slotElogEQSLFileUploaded (QNetworkReply::NetworkError _error, QList _qsos) { @@ -3135,7 +3118,6 @@ void MainWindow::slotElogEQSLFileUploaded (QNetworkReply::NetworkError _error, Q //qDebug() << "MainWindow::slotElogEQSLFileUploaded - END" << Qt::endl; } - void MainWindow::slotElogQRZCOMLogUploaded (QNetworkReply::NetworkError _error, QList _qsos) { @@ -3201,6 +3183,7 @@ void MainWindow::slotElogQRZCOMLogUploaded (QNetworkReply::NetworkError _error, //qDebug() << "MainWindow::slotElogEQSLFileUploaded - END" << Qt::endl; } + void MainWindow::slotElogQRZCOMShowMessage(const QString &_s) { //qDebug() << "MainWindow::slotElogQRZCOMShowMessage: " << _s << Qt::endl; @@ -3208,6 +3191,7 @@ void MainWindow::slotElogQRZCOMShowMessage(const QString &_s) slotUpdateStatusBar(_s); logEvent(Q_FUNC_INFO, "END", logSeverity); } + void MainWindow::cleanQRZCOMreceivedDataFromUI() { if (!modify) @@ -3636,7 +3620,6 @@ void MainWindow::clearUIDX(bool _full) } - void MainWindow::slotRefreshDXCCWidget() { logEvent(Q_FUNC_INFO, "Start", logSeverity); @@ -4069,7 +4052,6 @@ void MainWindow::slotToolSearchNeededQSLRequested() logEvent(Q_FUNC_INFO, "END", logSeverity); } - void MainWindow::slotToolLoTWMarkAllQueuedThisLog() { //qDebug() << "MainWindow::slotToolLoTWMarkAllQueuedThisLog" << Qt::endl; @@ -4454,6 +4436,7 @@ void MainWindow::slotHelpAboutAction() logEvent(Q_FUNC_INFO, "END", logSeverity); //helpAboutDialog->exec(); } + void MainWindow::slotTipsAction() { //qDebug() << "MainWindow::slotTipsAction " << Qt::endl; @@ -4509,8 +4492,6 @@ void MainWindow::slotShowSoftUpdateResults(const bool _b) logEvent(Q_FUNC_INFO, "END", logSeverity); } - - void MainWindow::slotLogWinShow() { //qDebug() << "MainWindow::slotLogWinShow: " << Qt::endl; @@ -4539,7 +4520,6 @@ void MainWindow::slotSetup(const int _page) logEvent(Q_FUNC_INFO, "END", logSeverity); } - void MainWindow::openSetup(const int _page) { //qDebug() << Q_FUNC_INFO << ": " << QString::number(_page) << Qt::endl; @@ -4651,7 +4631,6 @@ bool MainWindow::slotOpenKLogFolder() } - void MainWindow::slotUpdateStatusBar(const QString &statusm) { @@ -4661,7 +4640,6 @@ void MainWindow::slotUpdateStatusBar(const QString &statusm) logEvent(Q_FUNC_INFO, "END", logSeverity); } - bool MainWindow::readCtyFile() { logEvent(Q_FUNC_INFO, "Start", logSeverity); @@ -4925,8 +4903,74 @@ void MainWindow::startServices() setHamlib(hamlibActive); setUDPServer(UDPServerStart); } + +void MainWindow::checkIfNewBandOrMode() +{//Checks the log to see if there is a QSO with a band/mode +//that is not currently selected as active + //qDebug() << "MainWindow::checkIfNewBandOrMode - START " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + logEvent(Q_FUNC_INFO, "Start", logSeverity); + QString currentBand = mainQSOEntryWidget->getBand(); + QString currentMode = mainQSOEntryWidget->getMode(); + setupDialog->checkIfNewBandOrMode(); // Update the Setup dialog with new bands or modes + //qDebug() << "MainWindow::checkIfNewBandOrMode - 1 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + QStringList bandsInLog = dataProxy->getBandsInLog(currentLog); + //qDebug() << "MainWindow::checkIfNewBandOrMode - 2 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + QStringList modesInLog = dataProxy->getModesInLog(currentLog); + //qDebug() << "MainWindow::checkIfNewBandOrMode - 3 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + QStringList qsTemp; + qsTemp.clear(); + //qDebug() << "MainWindow::checkIfNewBandOrMode - 3.1 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + bands << bandsInLog; + bands.removeDuplicates(); + //qDebug() << "MainWindow::checkIfNewBandOrMode - 3.2 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + qsTemp << dataProxy->sortBandNamesBottonUp(bands); + //qDebug() << "MainWindow::checkIfNewBandOrMode - 3.3 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + bands.clear(); + bands = qsTemp; + + modes << modesInLog; + modes.removeDuplicates(); + modes.sort(); + + //qDebug() << "MainWindow::checkIfNewBandOrMode - bands -" << QString::number(bands.length()) << " - " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + mainQSOEntryWidget->setBands(bands); + satTabWidget->addBands(bands); + + //qDebug() << "MainWindow::checkIfNewBandOrMode - modes -" << QString::number(modes.length()) << " - " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + mainQSOEntryWidget->setModes(modes); + + + //qDebug() << "MainWindow::checkIfNewBandOrMode - setting bands" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + logEvent(Q_FUNC_INFO, "Setting bands", Debug); + dxccStatusWidget->setBands(Q_FUNC_INFO, bands, true); + + //qDebug() << "MainWindow::checkIfNewBandOrMode - currentBand: " << currentBand << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + if (bands.contains(currentBand)) + { + mainQSOEntryWidget->setBand(currentBand); + + } + else + { + selectDefaultBand(); + } + + //qDebug() << "MainWindow::checkIfNewBandOrMode-99 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; + if (modes.contains(currentMode)) + { + mainQSOEntryWidget->setMode(currentMode); + } + else + { + selectDefaultMode(); + } + + + logEvent(Q_FUNC_INFO, "END", logSeverity); + //qDebug() << "MainWindow::checkIfNewBandOrMode END " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; +} + bool MainWindow::processConfigData() -//bool MainWindow::processConfigLine(const QString &_line) { //qDebug() << Q_FUNC_INFO << ": " << _line << Qt::endl; @@ -4962,6 +5006,7 @@ bool MainWindow::processConfigData() dxclusterServerToConnect = "dxfun.com"; dxclusterServerPort = 8000; } + dxClusterWidget->setDXClusterServer(dxclusterServerToConnect, dxclusterServerPort); myDataTabWidget->setSetupMyPower(config.value("power").toFloat()); @@ -5081,126 +5126,61 @@ bool MainWindow::processConfigData() break; } } - dxClusterWidget->setCurrentLog(currentLog); - dxccStatusWidget->setCurrentLog(currentLog); - //qDebug() << "MainWindow::processConfigLine: currentLog: " << value << endl; + } + dxClusterWidget->setCurrentLog(currentLog); + dxccStatusWidget->setCurrentLog(currentLog); + //qDebug() << "MainWindow::processConfigLine: currentLog: " << value << endl; - clublogActive = config.value("clublog/active").toBool(); - setupDialog->setClubLogActive(clublogActive); - clublogRealTime = config.value("clublog/realtime").toBool(); - clublogPass = config.value("clublog/pass").toString(); - clublogEmail = config.value("clublog/email").toString(); + clublogActive = config.value("clublog/active").toBool(); + setupDialog->setClubLogActive(clublogActive); + clublogRealTime = config.value("clublog/realtime").toBool(); + clublogPass = config.value("clublog/pass").toString(); + clublogEmail = config.value("clublog/email").toString(); - qrzcomActive = config.value("qrzcom/active").toBool(); - setupDialog->setQRZCOMAutoCheckActive(QRZCOMAutoCheckAct->isChecked()); - QRZCOMAutoCheckAct->setChecked(config.value("qrzcom/auto").toBool()); - setupDialog->setQRZCOMAutoCheckActive(config.value("qrzcom/auto").toBool()); - qrzcomPass = config.value("qrzcom/pass").toString(); - qrzcomUser = config.value("qrzcom/user").toString(); - elogQRZcom->setLogBookKey(config.value("qrzcom/logbookkey").toString()); + qrzcomActive = config.value("qrzcom/active").toBool(); + setupDialog->setQRZCOMAutoCheckActive(QRZCOMAutoCheckAct->isChecked()); + QRZCOMAutoCheckAct->setChecked(config.value("qrzcom/auto").toBool()); + setupDialog->setQRZCOMAutoCheckActive(config.value("qrzcom/auto").toBool()); + qrzcomPass = config.value("qrzcom/pass").toString(); + qrzcomUser = config.value("qrzcom/user").toString(); + elogQRZcom->setLogBookKey(config.value("qrzcom/logbookkey").toString()); - eQSLActive = config.value("eqsl/active").toBool(); - setupDialog->setEQSLActive(eQSLActive); - eQSLRealTime = config.value("eqsl/realtime").toBool(); - eqslUtilities->setUser(config.value("eqsl/call").toString()); - eqslUtilities->setPass(config.value("eqsl/pass").toString()); - eQSLUseQSOStationCallSign = config.value("eqsl/usestationcallsign").toBool(); + eQSLActive = config.value("eqsl/active").toBool(); + setupDialog->setEQSLActive(eQSLActive); + eQSLRealTime = config.value("eqsl/realtime").toBool(); + eqslUtilities->setUser(config.value("eqsl/call").toString()); + eqslUtilities->setPass(config.value("eqsl/pass").toString()); + eQSLUseQSOStationCallSign = config.value("eqsl/usestationcallsign").toBool(); - if (config.value("lotw/active").toBool()) - { - lotwActive = true; - lotwCallTQSL->setEnabled(true); - lotwCallTQSL->setWhatsThis(tr("Sends the log to LoTW calling TQSL.")); - } - else - { - lotwActive = false; - lotwCallTQSL->setEnabled(false); - lotwCallTQSL->setWhatsThis(tr("This function is disabled. Go to the Setup->LoTW tab to enable it.")); - } + if (config.value("lotw/active").toBool()) + { + lotwActive = true; + lotwCallTQSL->setEnabled(true); + lotwCallTQSL->setWhatsThis(tr("Sends the log to LoTW calling TQSL.")); + } + else + { + lotwActive = false; + lotwCallTQSL->setEnabled(false); + lotwCallTQSL->setWhatsThis(tr("This function is disabled. Go to the Setup->LoTW tab to enable it.")); + } - lotwTQSLpath = config.value("lotw/path").toString(); - lotwUtilities->setUser(config.value("lotw/user").toString()); - lotwUtilities->setPass(config.value("lotw/pass").toString()); - if (softwareVersion!=config.value("version").toString()) - { - //qDebug() << "MainWindow::processConfigLine: NONE: " << endl; - itIsANewversion = true; - } - windowSize = config.value("window/size").toSize(); - deleteAlwaysAdiFile = config.value("deletealwaysadifile").toBool(); + lotwTQSLpath = config.value("lotw/path").toString(); + lotwUtilities->setUser(config.value("lotw/user").toString()); + lotwUtilities->setPass(config.value("lotw/pass").toString()); + if (softwareVersion!=config.value("version").toString()) + { + //qDebug() << "MainWindow::processConfigLine: NONE: " << endl; + itIsANewversion = true; + } + windowSize = config.value("window/size").toSize(); + deleteAlwaysAdiFile = config.value("deletealwaysadifile").toBool(); //qDebug() << "MainWindow::processConfigLine: END" << Qt::endl; logEvent(Q_FUNC_INFO, "END", logSeverity); return true; } -void MainWindow::checkIfNewBandOrMode() -{//Checks the log to see if there is a QSO with a band/mode -//that is not currently selected as active - //qDebug() << "MainWindow::checkIfNewBandOrMode - START " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - logEvent(Q_FUNC_INFO, "Start", logSeverity); - QString currentBand = mainQSOEntryWidget->getBand(); - QString currentMode = mainQSOEntryWidget->getMode(); - setupDialog->checkIfNewBandOrMode(); // Update the Setup dialog with new bands or modes - //qDebug() << "MainWindow::checkIfNewBandOrMode - 1 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - QStringList bandsInLog = dataProxy->getBandsInLog(currentLog); - //qDebug() << "MainWindow::checkIfNewBandOrMode - 2 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - QStringList modesInLog = dataProxy->getModesInLog(currentLog); - //qDebug() << "MainWindow::checkIfNewBandOrMode - 3 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - QStringList qsTemp; - qsTemp.clear(); - //qDebug() << "MainWindow::checkIfNewBandOrMode - 3.1 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - bands << bandsInLog; - bands.removeDuplicates(); - //qDebug() << "MainWindow::checkIfNewBandOrMode - 3.2 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - qsTemp << dataProxy->sortBandNamesBottonUp(bands); - //qDebug() << "MainWindow::checkIfNewBandOrMode - 3.3 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - bands.clear(); - bands = qsTemp; - - modes << modesInLog; - modes.removeDuplicates(); - modes.sort(); - - //qDebug() << "MainWindow::checkIfNewBandOrMode - bands -" << QString::number(bands.length()) << " - " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - mainQSOEntryWidget->setBands(bands); - satTabWidget->addBands(bands); - - //qDebug() << "MainWindow::checkIfNewBandOrMode - modes -" << QString::number(modes.length()) << " - " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - mainQSOEntryWidget->setModes(modes); - - - //qDebug() << "MainWindow::checkIfNewBandOrMode - setting bands" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - logEvent(Q_FUNC_INFO, "Setting bands", Debug); - dxccStatusWidget->setBands(Q_FUNC_INFO, bands, true); - - //qDebug() << "MainWindow::checkIfNewBandOrMode - currentBand: " << currentBand << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - if (bands.contains(currentBand)) - { - mainQSOEntryWidget->setBand(currentBand); - - } - else - { - selectDefaultBand(); - } - - //qDebug() << "MainWindow::checkIfNewBandOrMode-99 " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; - if (modes.contains(currentMode)) - { - mainQSOEntryWidget->setMode(currentMode); - } - else - { - selectDefaultMode(); - } - - - logEvent(Q_FUNC_INFO, "END", logSeverity); - //qDebug() << "MainWindow::checkIfNewBandOrMode END " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; -} - void MainWindow::selectDefaultBand() { //qDebug() << "MainWindow::selectDefaultBand" << Qt::endl; @@ -7692,7 +7672,7 @@ void MainWindow::slotWSJTXloggedQSO (const QString &_dxcall, const QString &_mod if (qsoLogged) { - //qDebug() << Q_FUNC_INFO << " Logged QSO OK: " << _dxcall << Qt::endl; + qDebug() << Q_FUNC_INFO << " Logged QSO OK: " << _dxcall << Qt::endl; actionsJustAfterAddingOneQSO(); infoLabel1T = infoLabel1->text(); infoLabel2T = infoLabel2->text(); @@ -7715,17 +7695,17 @@ void MainWindow::slotWSJTXloggedQSO (const QString &_dxcall, const QString &_mod } else { - //qDebug() << Q_FUNC_INFO << " Logged QSO NOK: " << _dxcall << Qt::endl; + qDebug() << Q_FUNC_INFO << " Logged QSO NOK: " << _dxcall << Qt::endl; } } else { - //qDebug() << Q_FUNC_INFO << " QSO must NOT be logged ... ending" << Qt::endl; + qDebug() << Q_FUNC_INFO << " QSO must NOT be logged ... ending" << Qt::endl; } logEvent(Q_FUNC_INFO, "END", logSeverity); - //qDebug() << Q_FUNC_INFO << " - END" << Qt::endl; + qDebug() << Q_FUNC_INFO << " - END" << Qt::endl; } diff --git a/src/setuppages/setuppagehamlib.cpp b/src/setuppages/setuppagehamlib.cpp index 91768473..08721b8a 100644 --- a/src/setuppages/setuppagehamlib.cpp +++ b/src/setuppages/setuppagehamlib.cpp @@ -479,7 +479,12 @@ void SetupPageHamLib::setActive(const bool &_active) activateHamlibCheckBox->setChecked(_active); } -void SetupPageHamLib::isReadOnly() +bool SetupPageHamLib::isActive() +{ + return activateHamlibCheckBox->isChecked(); +} + +bool SetupPageHamLib::isReadOnly() { return readOnlyModeCheckBox->isChecked(); }