hamradio/klog
1
0
Fork 0
mirror of https://github.com/ea4k/klog.git synced 2024-09-21 10:28:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Work in progress

Browse Source
This commit is contained in:
ea4k 2021-08-16 19:46:08 +02:00
parent 32c8a82983
commit 5bf97d7a62
33 changed files with 964 additions and 1668 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TODO
View File

@ -1,3 +1,7 @@
Done to: src/setuppages/setuppagedxcluster.h
https://github.com/foldynl/klog/commit/d68a9fec601805232281c5ca338328e95d51bd0b#diff-8a6a421339db369cb2b34097f1a6fede57afb13e7e858e255ed7d6895f814540
BUG: KLog needs to update the Entity DB is shown on every start BUG: KLog needs to update the Entity DB is shown on every start
KLog should update ALWAYS when receiving from LoTW the QSL_LOTW_rcvd or add the QSO if not in local log. KLog should update ALWAYS when receiving from LoTW the QSL_LOTW_rcvd or add the QSO if not in local log.

4
src/database.cpp
View File

@ -23,8 +23,8 @@
* along with KLog. If not, see <https://www.gnu.org/licenses/>. * * along with KLog. If not, see <https://www.gnu.org/licenses/>. *
* * * *
*****************************************************************************/ *****************************************************************************/
#include "database.h" #include "database.h"
#include "klogconfig.h"
//#include <qDebug> //#include <qDebug>
DataBase::DataBase(const QString &_parentClass, const QString &_DBName) DataBase::DataBase(const QString &_parentClass, const QString &_DBName)
@ -1567,7 +1567,7 @@ void DataBase::backupB4Update()
void DataBase::logBackup() void DataBase::logBackup()
{ {
//qDebug() << "DataBase::logBackup - Start" << Qt::endl; //qDebug() << "DataBase::logBackup - Start" << Qt::endl;
//KlogConfig config;
QFile DBFile(util->getKLogDBFile()); QFile DBFile(util->getKLogDBFile());
QString newFile = util->getKLogDBBackupFile(); QString newFile = util->getKLogDBBackupFile();
bool copied = DBFile.copy(newFile); bool copied = DBFile.copy(newFile);

2
src/filemanager.h
View File

@ -36,7 +36,6 @@
#include <QSqlQuery> #include <QSqlQuery>
#include <QStringList> #include <QStringList>
#include <QSqlRecord> #include <QSqlRecord>
#include <QProgressDialog>
#include <QMessageBox> #include <QMessageBox>
#include <QDateTime> #include <QDateTime>
#include "world.h" #include "world.h"
@ -80,7 +79,6 @@ public:
bool adifLogExportMarked(const QString& _fileName); bool adifLogExportMarked(const QString& _fileName);
bool adifReqQSLExport(const QString& _fileName); bool adifReqQSLExport(const QString& _fileName);
//bool cabrilloLogExport(const QString& _fileName, const QString &_contestType, const int logNconst); //bool cabrilloLogExport(const QString& _fileName, const QString &_contestType, const int logNconst);
bool modifySetupFile(const QString& _filename, const QString &_field, const QString &_value);
void setVersion(const QString &_version); void setVersion(const QString &_version);
QDateTime getDateTimeOfLastBackup(); QDateTime getDateTimeOfLastBackup();
void setStationCallSign(const QString& _st); void setStationCallSign(const QString& _st);

2
src/klog.1
View File

@ -33,7 +33,7 @@ through klog:
KLog has a very basic printing feature implemented. KLog has a very basic printing feature implemented.
.SH PREFERENCES .SH PREFERENCES
You can edit the ~/.klog/klogrc file to setup you call and locator. You can edit the ~/.klog/klog.ini file to setup you call and locator.
.P .P
All the data files are saved in the KLog home directory (~/.klog) by All the data files are saved in the KLog home directory (~/.klog) by

229
src/klogconfig.cpp Normal file
View File

@ -0,0 +1,229 @@
/***************************************************************************
klogconfig.cpp - description
-------------------
begin : Jun 2021
copyright : (C) 2021 by Ladislav Foldyna
***************************************************************************/
/*****************************************************************************
* This file is part of KLog. *
* *
* KLog is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* KLog is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with KLog. If not, see <https://www.gnu.org/licenses/>. *
* *
*****************************************************************************/
#include <QSettings>
#include <QString>
#include <QFile>
#include <QTextStream>
#include <QSize>
#include "klogconfig.h"
#include "utilities.h"
KlogConfig::KlogConfig()
: QSettings(Utilities::getHomeDir().append("/klog.ini"), QSettings::IniFormat)
{
}
KlogConfig::~KlogConfig()
{
}
bool KlogConfig::old2newMigrationSuccess()
{
qDebug() << "KlogConfig::old2newMigrationSuccess - START" << endl;
QString oldconfig = Utilities::getHomeDir() +
#if defined(Q_OS_WIN)
("/klogrc.cfg");
#else
("/klogrc");
#endif
if (!QFile::exists(oldconfig))
{
qDebug() << "KlogConfig::old2newMigrationSuccess - " << oldconfig << " does not exists - END" << endl;
//old config does not exists
return false;
}
QFile file(oldconfig);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
qDebug() << "KlogConfig::old2newMigrationSuccess - " << oldconfig << " cannot open - END" << endl;
//cannot open file
return false;
}
QTextStream in(&file);
while (!in.atEnd())
{
QString line;
line.clear();
line = in.readLine();
processOldConfigLine(line);
}
file.close();
qDebug() << "KlogConfig::old2newMigrationSuccess - END" << endl;
return true;
}
void KlogConfig::processOldConfigLine(const QString &_line)
{
qDebug() << "KlogConfig::ProcessOldConfigLine - ["<< _line << "] - START" << endl;
QString line = _line.simplified();
if (!((line.contains('=')) && (line.contains(';'))))
{
return;
}
if (line.startsWith('#'))
{
return;
}
QStringList config_values;
config_values.clear();
config_values << line.split("=", QString::SkipEmptyParts);
if (config_values.length() != 2)
{
return;
}
QString field = (config_values.at(0)).toUpper();
QString config_value = config_values.at(1);
config_value = config_value.remove(";");
qDebug() << "KlogConfig::ProcessOldConfigLine [1:" << field << ", 2:" << config_value << "]" << endl;
if (field == "CALLSIGN") setValue("userdata/callsign", config_value.toUpper());
else if (field == "OPERATORS") setValue("userdata/operators", config_value);
else if (field == "CQZ") setValue("userdata/cqz", config_value);
else if (field == "ITUZ") setValue("userdata/ituz", config_value);
else if (field == "STATIONLOCATOR") setValue("userdata/stationlocator", config_value);
else if (field == "NAME") setValue("userdata/name", config_value);
else if (field == "ADDRESS1") setValue("userdata/address1", config_value);
else if (field == "ADDRESS2") setValue("userdata/address2", config_value);
else if (field == "ADDRESS3") setValue("userdata/address3", config_value);
else if (field == "ADDRESS4") setValue("userdata/address4", config_value);
else if (field == "ADDRESS4") setValue("userdata/address4", config_value);
else if (field == "CITY") setValue("userdata/city", config_value);
else if (field == "ZIPCODE") setValue("userdata/zipcode", config_value);
else if (field == "PROVINCESTATE") setValue("userdata/provincestate", config_value);
else if (field == "COUNTRY") setValue("userdata/country", config_value);
else if (field == "POWER") setValue("userdata/power", config_value.toFloat());
else if (field == "RIG1") setValue("userdata/rig1", config_value);
else if (field == "RIG2") setValue("userdata/rig2", config_value);
else if (field == "RIG3") setValue("userdata/rig3", config_value);
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 == "REALTIME" // generic false / true mapping
|| field == "USEDEFAULTNAME"
|| field == "IMPERIALSYSTEM"
|| field == "SENDQSLWHENREC"
|| field == "MANAGEDXMARATHON"
|| field == "SHOWCALLSIGNINSEARCH"
|| field == "CHECKNEWVERSIONS"
|| field == "PROVIDEINFO"
|| field == "ALWAYSADIF"
|| field == "DEBUGLOG"
|| field == "UTCTIME"
|| field == "SENDEQSLBYDEFAULT"
|| field == "COMPLETEWITHPREVIOUS"
|| field == "DELETEALWAYSADIFILE"
|| field == "LATESTBACKUP" ) setValue(field.toLower(), config_value.toLower());
else if (field == "DXCLUSTERSERVERTOUSE") setValue("DXC/servertouse", config_value);
else if (field == "DXCLUSTERSAVE") setValue("DXC/save", config_value.toLower());
else if (field == "DXCLUSTERSHOWHF") setValue("DXC/showhf", config_value.toLower());
else if (field == "DXCLUSTERSHOWVHF") setValue("DXC/showvhf", config_value.toLower());
else if (field == "DXCLUSTERSHOWWARC") setValue("DXC/showwarc", config_value.toLower());
else if (field == "DXCLUSTERSHOWWORKED") setValue("DXC/showworked", config_value.toLower());
else if (field == "DXCLUSTERSHOWCONFIRMED") setValue("DXC/showconfirmed", config_value.toLower());
else if (field == "DXCLUSTERSHOWANN") setValue("DXC/showann", config_value.toLower());
else if (field == "DXCLUSTERSHOWWWV") setValue("DXC/showwwn", config_value.toLower());
else if (field == "DXCLUSTERSHOWWCY") setValue("DXC/showwcy", config_value.toLower());
else if (field == "DEFAULTADIFFILE") setValue("defaultadiffile", config_value.toLower());
else if (field == "STATIONLOCATOR") setValue("stationlocator", config_value);
else if (field == "POWER") setValue("power", (config_value.toFloat()>0.0f) ? config_value.toFloat(): 0.0);
else if (field == "DUPLICATEDQSOSLOT") setValue("duplicatedqsoslot", (config_value.toInt()>0) ? config_value.toInt(): 0);
else if (field == "NEWONECOLOR") setValue("colors/newone", config_value);
else if (field == "NEEDEDCOLOR") setValue("colors/needed", config_value);
else if (field == "WORKEDCOLOR") setValue("colors/worked", config_value);
else if (field == "CONFIRMEDCOLOR") setValue("colors/confirmed", config_value);
else if (field == "DEFAULTCOLOR") setValue("colors/default", config_value);
else if (field == "UDPSERVER") setValue("udpserver/active", config_value.toLower());
else if (field == "UDPNETWORKINTERFACE") setValue("udpserver/interface", config_value);
else if (field == "UDPSERVERPORT") setValue("udpserver/port", (config_value.toInt()>0 && config_value.toInt()<65536) ? config_value.toInt() : 1234);
else if (field == "INFOTIMEOUT") setValue("infotimeout", (config_value.toInt()>0 && config_value.toInt()<65536) ? config_value.toInt() : 0);
else if (field == "LOGFROMWSJTX") setValue("wsjtx/logfromwsjtx", config_value.toLower());
else if (field == "LOGAUTOFROMWSJTX") setValue("wsjtx/logautofromwsjtx", config_value.toLower());
else if (field == "REALTIMEFROMWSJTX") setValue("wsjtx/realtimefromwsjtx", config_value.toLower());
else if (field == "HAMLIBRIGTYPE") setValue("hamlib/rigtype", config_value.toInt());
else if (field == "HAMLIBSERIALPORT") setValue("hamlib/serialport", config_value);
else if (field == "HAMLIBSERIALBAUDS") setValue("hamlib/serialbauds", config_value);
else if (field == "HAMLIBSERIALDATABITS") setValue("hamlib/serialdatabits", config_value);
else if (field == "HAMLIBSERIALSTOPBITS") setValue("hamlib/serialstopbits", config_value);
else if (field == "HAMLIBSERIALFLOWCONTROL") setValue("hamlib/serialflowcontrol", config_value);
else if (field == "HAMLIBSERIALPARITY") setValue("hamlib/serialparity", config_value);
else if (field == "HAMLIBRIGPOLLRATE") setValue("hamlib/pollrate", config_value.toInt());
else if (field == "HAMLIB") setValue("hamlib/active", config_value.toLower());
else if (field == "HAMLIBREADONLY") setValue("hamlib/readonly", config_value.toLower());
else if (field == "HAMLIBNETADDRESS") setValue("hamlib/netaddress", config_value);
else if (field == "HAMLIBNETPORT") setValue("hamlib/netport", (config_value.toInt()>0 && config_value.toInt()<65536) ? config_value.toInt() : 1234);
else if (field == "SELECTEDLOG") setValue("selectedlog", config_value.toInt());
else if (field == "CLUBLOGACTIVE") setValue("clublog/active", config_value.toLower());
else if (field == "CLUBLOGREALTIME") setValue("clublog/realtime", config_value.toLower());
else if (field == "CLUBLOGPASS") setValue("clublog/pass", config_value);
else if (field == "CLUBLOGEMAIL") setValue("clublog/email", config_value);
else if (field == "QRZCOMACTIVE") setValue("qrzcom/active", config_value.toInt());
else if (field == "QRZCOMAUTO") setValue("qrzcom/auto", config_value.toInt());
else if (field == "QRZCOMPASS") setValue("qrzcom/pass", config_value);
else if (field == "QRZCOMUSER") setValue("qrzcom/user", config_value);
else if (field == "QRZCOMLOGBOOKKEY") setValue("qrzcom/logbookkey", config_value);
else if (field == "EQSLACTIVE") setValue("eqsl/active", config_value.toLower());
else if (field == "EQSLREALTIME") setValue("eqsl/realtime", config_value.toLower());
else if (field == "EQSLCALL") setValue("eqsl/call", config_value);
else if (field == "EQSLPASS") setValue("eqsl/pass", config_value);
else if (field == "EQSLUSESTATIONCALLSIGN") setValue("eqsl/usestationcallsign", config_value.toLower());
else if (field == "LOTWACTIVE") setValue("lotw/active", config_value.toLower());
else if (field == "LOTWPATH") setValue("lotw/path", config_value);
else if (field == "LOTWUSER") setValue("lotw/user", config_value);
else if (field == "LOTWPASS") setValue("lotw/pass", config_value);
else if (field == "MAINWINDOWSIZE")
{
QStringList tmp;
tmp.clear();
tmp << config_value.split("x");
setValue("window/size", QSize(tmp.at(0).toInt(), tmp.at(1).toInt()));
}
else
{
// the rest of fields "as-in" into generic
setValue(field.toLower(), config_value);
}
qDebug() << "KlogConfig::ProcessOldConfigLine - END" << endl;
return;
}

41
src/klogconfig.h Normal file
View File

@ -0,0 +1,41 @@
#ifndef KLOGCONFIG
#define KLOGCONFIG
/***************************************************************************
permanent_config - description
-------------------
begin : Jun 2021
copyright : (C) 2021 by Ladislav Foldyna
***************************************************************************/
/*****************************************************************************
* This file is part of KLog. *
* *
* KLog is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* KLog is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with KLog. If not, see <https://www.gnu.org/licenses/>. *
* *
*****************************************************************************/
#include <QString>
#include <QObject>
#include "klogdefinitions.h"
class KlogConfig: public QSettings
{
public:
KlogConfig();
~KlogConfig();
bool old2newMigrationSuccess();
void processOldConfigLine(const QString &_line);
};
#endif // KLOGCONFIG

51
src/main.cpp
View File

@ -43,7 +43,7 @@
#include "startwizard.h" #include "startwizard.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "utilities.h" #include "utilities.h"
#include "klogconfig.h"
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -53,7 +53,7 @@ int main(int argc, char *argv[])
QDir d1 = QDir(); QDir d1 = QDir();
QString version = "1.8"; QString version = "1.8";
//qDebug() << "KLog Main STARTED: " << version << Qt::endl; //qDebug() << "KLog Main STARTED: " << version << Qt::endl;
Utilities util = Utilities(); //Utilities util = Utilities();
QStringList arguments; QStringList arguments;
QTextStream cout(stdout); QTextStream cout(stdout);
QCoreApplication::setOrganizationName("EA4K"); QCoreApplication::setOrganizationName("EA4K");
@ -266,12 +266,13 @@ int main(int argc, char *argv[])
// END OF Application Singleton // END OF Application Singleton
QString configFileName, klogDir; //QString configFileName, klogDir;
klogDir = util.getHomeDir(); //klogDir = util.getHomeDir();
configFileName = util.getCfgFile(); //configFileName = util.getCfgFile();
//qDebug() << "KLog Main-10" << Qt::endl; //qDebug() << "KLog Main-10" << Qt::endl;
QString klogDir = Utilities::getHomeDir();
//qDebug() << "KLog Main: Setting klog dir: " << (QTime::currentTime()).toString("HH:mm:ss")<< Qt::endl;; //qDebug() << "KLog Main: Setting klog dir: " << (QTime::currentTime()).toString("HH:mm:ss")<< Qt::endl;;
if (!QDir::setCurrent (klogDir) ) if (!QDir::setCurrent (klogDir) )
@ -303,8 +304,29 @@ int main(int argc, char *argv[])
QPixmap pixmap(":img/klog_512x512.png"); QPixmap pixmap(":img/klog_512x512.png");
//qDebug() << "KLog Main-51" << (QTime::currentTime()).toString("HH:mm:ss") << Qt::endl; //qDebug() << "KLog Main-51" << (QTime::currentTime()).toString("HH:mm:ss") << Qt::endl;
QSplashScreen splash(pixmap); QSplashScreen splash(pixmap);
if(!QFile::exists(configFileName)) KlogConfig config;
if(!config.contains("version"))
{ {
//configure file does not exist
//try to migrate old config to new format, if exists
if(!config.old2newMigrationSuccess())
{
//does not exists or error - Starting wizard
StartWizard *wizard = new StartWizard(klogDir, version);
wizard->setModal(true);
wizard->exec();
}
MainWindow mw(klogDir, version);
mw.init();
splash.finish(&mw);
mw.show();
return app.exec();
#if 0
//qDebug() << "MAIN: Starting wizard... " << Qt::endl; //qDebug() << "MAIN: Starting wizard... " << Qt::endl;
StartWizard *wizard = new StartWizard(klogDir, version); StartWizard *wizard = new StartWizard(klogDir, version);
@ -319,8 +341,6 @@ int main(int argc, char *argv[])
MainWindow mw(klogDir, version); MainWindow mw(klogDir, version);
mw.init(); mw.init();
splash.finish(&mw); splash.finish(&mw);
//mw.checkIfNewVersion();
//mw.recommendBackupIfNeeded();
mw.show(); mw.show();
return app.exec(); return app.exec();
} }
@ -369,12 +389,23 @@ int main(int argc, char *argv[])
} }
return 0; return 0;
} }
#endif
} }
else else
{ {
//qDebug() << "Main: Start of DB Activities" << Qt::endl; //qDebug() << "Main: Start of DB Activities" << Qt::endl;
DataBase *db = new DataBase(Q_FUNC_INFO, version, util.getKLogDBFile()); //DataBase *db = new DataBase(Q_FUNC_INFO, version, util.getKLogDBFile());
// configuration file exists
//qDebug() << "Main: Start of DB Activities" << endl;
QString db_dir = config.value("dbpath",
Utilities::getHomeDir()).toString();
qDebug() << "Main: db_dir: " << db_dir << endl;
DataBase *db = new DataBase(Q_FUNC_INFO, version, db_dir.append("/logbook.dat"));
//qDebug() << "Main: After Start of DB Activities" << Qt::endl; //qDebug() << "Main: After Start of DB Activities" << Qt::endl;
if (!db->createConnection(Q_FUNC_INFO)) if (!db->createConnection(Q_FUNC_INFO))
{ {

621
src/mainwindow.cpp
View File

@ -32,6 +32,7 @@
#include <QNetworkRequest> #include <QNetworkRequest>
#include "database.h" #include "database.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "klogconfig.h"
//#include <qDebug> //#include <qDebug>
@ -133,7 +134,6 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
aboutDialog = new AboutDialog(softwareVersion); aboutDialog = new AboutDialog(softwareVersion);
tipsDialog = new TipsDialog(); tipsDialog = new TipsDialog();
configFileName = util->getCfgFile();
ctyDatFile = util->getCTYFile(); ctyDatFile = util->getCTYFile();
downloadcty = new DownLoadCTY(klogDir, softwareVersion); downloadcty = new DownLoadCTY(klogDir, softwareVersion);
@ -153,7 +153,8 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
//qDebug() << "MainWindow::MainWindow: xx " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; //qDebug() << "MainWindow::MainWindow: xx " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
setupDialog = new SetupDialog(dataProxy, configFileName, softwareVersion, 0, !configured, this); //setupDialog = new SetupDialog(dataProxy, configFileName, softwareVersion, 0, !configured, this);
setupDialog = new SetupDialog(dataProxy, softwareVersion, 0, !configured, this);
//qDebug() << "MainWindow::MainWindow: satTabWidget to be created " << Qt::endl; //qDebug() << "MainWindow::MainWindow: satTabWidget to be created " << Qt::endl;
satTabWidget = new MainWindowSatTab(dataProxy); satTabWidget = new MainWindowSatTab(dataProxy);
@ -224,8 +225,10 @@ void MainWindow::saveWindowsSize()
{ {
//qDebug() << "MainWindow::saveWindows" << Qt::endl; //qDebug() << "MainWindow::saveWindows" << Qt::endl;
logEvent(Q_FUNC_INFO, "Start", logSeverity); logEvent(Q_FUNC_INFO, "Start", logSeverity);
KlogConfig config;
windowSize = this->size(); windowSize = this->size();
config.setValue("window/size", windowSize);
/*
int height = windowSize.height(); int height = windowSize.height();
int width = windowSize.width(); int width = windowSize.width();
//qDebug() << "MainWindow::windowsSizeAndPosition: /" << QString::number(width) << "/" << QString::number(height) << ")" << Qt::endl; //qDebug() << "MainWindow::windowsSizeAndPosition: /" << QString::number(width) << "/" << QString::number(height) << ")" << Qt::endl;
@ -234,7 +237,7 @@ void MainWindow::saveWindowsSize()
//(const QString& _filename, const QString &_field, const QString &_value) //(const QString& _filename, const QString &_field, const QString &_value)
filemanager->modifySetupFile(configFileName, "MainWindowSize", QString::number(width) + "x" + QString::number(height)); filemanager->modifySetupFile(configFileName, "MainWindowSize", QString::number(width) + "x" + QString::number(height));
//return QString::number(width) + "x" + QString::number(height); //return QString::number(width) + "x" + QString::number(height);
*/
logEvent(Q_FUNC_INFO, "END", logSeverity); logEvent(Q_FUNC_INFO, "END", logSeverity);
//qDebug() << "MainWindow::windowsSizeAndPosition: END" << Qt::endl; //qDebug() << "MainWindow::windowsSizeAndPosition: END" << Qt::endl;
@ -243,9 +246,6 @@ void MainWindow::saveWindowsSize()
void MainWindow::setWindowSize(const QSize &_size) void MainWindow::setWindowSize(const QSize &_size)
{ {
logEvent(Q_FUNC_INFO, "Start", logSeverity); logEvent(Q_FUNC_INFO, "Start", logSeverity);
//QSize size;
//size.setHeight(_height);
//size.setWidth(_width);
if (_size.isValid ()) if (_size.isValid ())
{ {
this->resize(_size); this->resize(_size);
@ -2913,12 +2913,12 @@ void MainWindow::slotElogClubLogDisable(const bool _b)
{ {
//qDebug() << "MainWindow::slotElogClubLogDisable: " << Qt::endl; //qDebug() << "MainWindow::slotElogClubLogDisable: " << Qt::endl;
logEvent(Q_FUNC_INFO, "Start", logSeverity); logEvent(Q_FUNC_INFO, "Start", logSeverity);
KlogConfig config;
clublogActive = !_b; clublogActive = !_b;
setupDialog->setClubLogActive(clublogActive); setupDialog->setClubLogActive(clublogActive);
config.setValue("clublog/active", false);
//TODO: Disable clublog in the klogrc file //filemanager->modifySetupFile(configFileName, "ClubLogActive", "False");
//bool FileManager::modifySetupFile(const QString& _filename, const QString &_field, const QString &_value)
filemanager->modifySetupFile(configFileName, "ClubLogActive", "False");
logEvent(Q_FUNC_INFO, "END", logSeverity); logEvent(Q_FUNC_INFO, "END", logSeverity);
} }
@ -4552,11 +4552,13 @@ void MainWindow::openSetup(const int _page)
//qDebug() << "MainWindow::openSetup - Just before setupDialog->exec-1" << Qt::endl; //qDebug() << "MainWindow::openSetup - Just before setupDialog->exec-1" << Qt::endl;
if (upAndRunning) if (upAndRunning)
{ {
setupDialog->setData(configFileName, softwareVersion, _page, !configured); setupDialog->setData(softwareVersion, _page, !configured);
//setupDialog->setData(configFileName, softwareVersion, _page, !configured);
} }
else else
{ {
setupDialog->setData(configFileName, softwareVersion, 0, !configured); setupDialog->setData(softwareVersion, 0, !configured);
//setupDialog->setData(configFileName, softwareVersion, 0, !configured);
} }
if ( (!configured) || (itIsANewversion) ) if ( (!configured) || (itIsANewversion) )
{ {
@ -4632,9 +4634,9 @@ void MainWindow::slotSetupDialogFinished (const int _s)
bool MainWindow::slotOpenKLogFolder() bool MainWindow::slotOpenKLogFolder()
{ {
//qDebug() << "MainWindow::slotOpenKLogFolder: " << configFileName << Qt::endl; //qDebug() << "MainWindow::slotOpenKLogFolder: " << Qt::endl;
logEvent(Q_FUNC_INFO, "Start", logSeverity); logEvent(Q_FUNC_INFO, "Start", logSeverity);
//configFileName = klogDir+"/klogrc.cfg";
QString _aux = "<ul><li><a href=file://" + util->getHomeDir() + ">file://" + util->getHomeDir() + "</a></li>" + QString _aux = "<ul><li><a href=file://" + util->getHomeDir() + ">file://" + util->getHomeDir() + "</a></li>" +
"<li><a href=file://" + util->getKLogDBFile() + ">file://" + util->getKLogDBFile() + "</a></i></ul>" ; "<li><a href=file://" + util->getKLogDBFile() + ">file://" + util->getKLogDBFile() + "</a></i></ul>" ;
QString _text = tr("You can find the KLog data folder here: ") + _aux; QString _text = tr("You can find the KLog data folder here: ") + _aux;
@ -4817,26 +4819,9 @@ void MainWindow::readConfigData()
//qDebug() << "MainWindow::readConfigData - END - 1" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; //qDebug() << "MainWindow::readConfigData - END - 1" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
return; return;
} }
QFile file(configFileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) /* Flawfinder: ignore */
{
//qDebug() << Q_FUNC_INFO << ": File not found" << configFileName << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
if (configured)
{
//qDebug() << Q_FUNC_INFO << ": configured = true" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
}
else
{
//qDebug() << Q_FUNC_INFO << ": configured = false" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
}
//qDebug() << Q_FUNC_INFO << ": Calling openSetup" << Qt::endl;
openSetup(0);
//qDebug() << Q_FUNC_INFO << ": After calling openSetup" << Qt::endl;
logEvent(Q_FUNC_INFO, "END-2", logSeverity);
//qDebug() << Q_FUNC_INFO << ": - END - 2" << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
return;
}
hamlibActive = false; hamlibActive = false;
setHamlib(hamlibActive);
eQSLActive = false; eQSLActive = false;
clublogActive = false; clublogActive = false;
lotwActive = false; lotwActive = false;
@ -4844,15 +4829,13 @@ void MainWindow::readConfigData()
//qDebug() << Q_FUNC_INFO << ": Before processConfigLine " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; //qDebug() << Q_FUNC_INFO << ": Before processConfigLine " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
QTextStream in(&file); //QTextStream in(&file);
while (!in.atEnd()) //while (!in.atEnd())
if (!processConfigData())
{ {
QString line; openSetup();
line.clear (); return;
line = in.readLine();
processConfigLine(line);
} }
file.close ();
//qDebug() << Q_FUNC_INFO << ": After processConfigLines " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl; //qDebug() << Q_FUNC_INFO << ": After processConfigLines " << QTime::currentTime().toString("hh:mm:ss") << Qt::endl;
//defineStationCallsign(mainQRZ); //defineStationCallsign(mainQRZ);
@ -4942,149 +4925,56 @@ void MainWindow::startServices()
setHamlib(hamlibActive); setHamlib(hamlibActive);
setUDPServer(UDPServerStart); setUDPServer(UDPServerStart);
} }
bool MainWindow::processConfigData()
bool MainWindow::processConfigLine(const QString &_line){ //bool MainWindow::processConfigLine(const QString &_line)
{
//qDebug() << Q_FUNC_INFO << ": " << _line << Qt::endl; //qDebug() << Q_FUNC_INFO << ": " << _line << Qt::endl;
logEvent(Q_FUNC_INFO, QString("Start: %1").arg(_line), logSeverity); logEvent(Q_FUNC_INFO, QString("Start"), logSeverity);
int _logWithMoreQSOs = 0; // At the end, if the this variable is >0 the Selectedlog will have to be changed in the file. int _logWithMoreQSOs = 0; // At the end, if the this variable is >0 the Selectedlog will have to be changed in the file.
QString line = _line.simplified();
//qDebug() << Q_FUNC_INFO << " - 2" << Qt::endl;
if (!( (line.contains('=')) && (line.contains(';')))){
//qDebug() << "MainWindow::processConfigLine: Wrong Line!" << Qt::endl;
logEvent(Q_FUNC_INFO, "END-2", logSeverity);
return false;
}
//qDebug() << Q_FUNC_INFO << " - 5" << Qt::endl;
if (line.startsWith('#'))
{
//qDebug() << "MainWindow::processConfigLine: notes Line!" << Qt::endl;
logEvent(Q_FUNC_INFO, "END-1", logSeverity);
return true;
}
//qDebug() << Q_FUNC_INFO << " - 10 " << Qt::endl;
QStringList values;
values.clear();
values << line.split("=", Qt::SkipEmptyParts);
//qDebug() << Q_FUNC_INFO << ": value length: " << QString::number(values.length ()) << Qt::endl;
if (values.length ()!=2)
{
//qDebug() << Q_FUNC_INFO << ": Returning false, wrong lenght!" << Qt::endl;
return false;
}
//qDebug() << Q_FUNC_INFO << ": value.at(0): " << values.at(0) << Qt::endl;
//qDebug() << Q_FUNC_INFO << ": value.at(1): " << values.at(1) << Qt::endl;
//qDebug() << Q_FUNC_INFO << " - 11 " << Qt::endl;
//qDebug() << Q_FUNC_INFO << " - 20 " << Qt::endl;
//qDebug() << Q_FUNC_INFO << " - 25" << Qt::endl;
QString field = (values.at(0)).toUpper();
//qDebug() << Q_FUNC_INFO << " - 26" << Qt::endl;
QString value = values.at(1);
//qDebug() << Q_FUNC_INFO << " - 28" << Qt::endl;
int endValue = value.indexOf(';');
if (endValue>-1){
value = value.left(value.length() - (value.length() - endValue));
}
//qDebug() << Q_FUNC_INFO << " - 30 " << Qt::endl;
QString aux; QString aux;
if (field == "CALLSIGN"){ KlogConfig config;
//qDebug() << Q_FUNC_INFO << " - 30.1 - Callsign: " << value << Qt::endl; if ( !config.contains("version"))
if (util->isValidCall(value))
{ {
mainQRZ = value; qDebug() << Q_FUNC_INFO << ": config does not exists";
myDataTabWidget->setStationQRZ(mainQRZ); return false;
} }
}else if (field=="CQZ"){
my_CQz = value.toInt();
}else if (field=="ITUZ"){
my_ITUz = value.toInt();
}else if (field=="CONTEST"){
//qDebug() << "MainWindow::processConfigLine: CONTEST: " << Qt::endl;
contestMode = value;
}else if (field=="MODES"){ if (util->isValidCall(config.value("callsign").toString()))
readActiveModes(value.split(", ", Qt::SkipEmptyParts)); {
}else if (field=="BANDS"){ mainQRZ = config.value("userdata/callsign").toString();
//qDebug() << "MainWindow::processConfigLine: BANDS: " << value << Qt::endl; }
readActiveBands(value.split(", ", Qt::SkipEmptyParts)); my_CQz = config.value("userdata/cqz").toInt();
}else if (field=="REALTIME"){ my_ITUz = config.value("userdata/ituz").toInt();
//qDebug << "MainWindow::processConfigLine: REALTIME: " << value.toUpper() << Qt::endl; contestMode = config.value("contest").toString();
mainQSOEntryWidget->setRealTime(util->trueOrFalse(value)); readActiveModes(config.value("modes").toStringList());
//realTime = util->trueOrFalse(value); readActiveBands(config.value("bands").toStringList());
}else if (field=="LOGVIEWFIELDS"){ mainQSOEntryWidget->setRealTime(config.value("realtime").toBool());
//qDebug() << "MainWindow::processConfigLine: LOGVIEWFIELDS: " << value.toUpper() << Qt::endl; aux = config.value("DXC/servertouse").toString();
logWindow->setColumns(value.split(",", Qt::SkipEmptyParts));
}else if (field =="DXCLUSTERSERVERTOUSE"){
aux = value; //dxfun.com:8000
if (aux.contains(':')) if (aux.contains(':'))
{ {
dxclusterServerToConnect = (aux.split(':', Qt::SkipEmptyParts)).at(0); dxclusterServerToConnect = (aux.split(':', Qt::SkipEmptyParts)).at(0);
dxclusterServerPort = ((aux.split(':', Qt::SkipEmptyParts)).at(1)).toInt(); dxclusterServerPort = ((aux.split(':', Qt::SkipEmptyParts)).at(1)).toInt();
} }
if ((dxclusterServerToConnect.length()< 3) || (dxclusterServerPort <= 0)) if ((dxclusterServerToConnect.length()< 3) || (dxclusterServerPort <= 0))
{ {
dxclusterServerToConnect = "dxfun.com"; dxclusterServerToConnect = "dxfun.com";
dxclusterServerPort = 8000; dxclusterServerPort = 8000;
} }
dxClusterWidget->setDXClusterServer(dxclusterServerToConnect, dxclusterServerPort); dxClusterWidget->setDXClusterServer(dxclusterServerToConnect, dxclusterServerPort);
}
else if(field=="POWER") myDataTabWidget->setSetupMyPower(config.value("power").toFloat());
{ useDefaultLogFileName = config.value("usedefaultname").toBool();
if (value.toFloat()>0.0f) imperialSystem = config.value("imperialsystem").toBool();
{ sendQSLWhenRec = config.value("sendqslwhenrec").toBool();
myPower = value.toDouble(); manageDxMarathon = config.value("managedxmarathon").toBool();
myDataTabWidget->setSetupMyPower(myPower);
}
}
else if (field=="USEDEFAULTNAME")
{
useDefaultLogFileName = util->trueOrFalse(value);
}
else if (field=="IMPERIALSYSTEM")
{
imperialSystem = util->trueOrFalse(value);
}
else if (field=="SENDQSLWHENREC")
{
sendQSLWhenRec = util->trueOrFalse(value);
}
else if (field=="MANAGEDXMARATHON")
{
//qDebug() << "MainWindow::processConfigLine: Marathon-1 - Value: " << value << Qt::endl;
manageDxMarathon = util->trueOrFalse(value);
//qDebug() << "MainWindow::processConfigLine: Marathon-2" << Qt::endl;
awardsWidget->setManageDXMarathon(manageDxMarathon); awardsWidget->setManageDXMarathon(manageDxMarathon);
} searchWidget->setShowCallInSearch(config.value("showcallsigninsearch").toBool());
checkNewVersions = config.value("checknewversions").toBool();
else if (field=="SHOWCALLSIGNINSEARCH") reportInfo = config.value("provideinfo").toBool();
{ alwaysADIF = config.value("alwaysadif").toBool();
searchWidget->setShowCallInSearch(util->trueOrFalse(value)); if (config.value("debuglog").toBool())
//stationCallSignShownInSearch = util->trueOrFalse(value);
}
else if (field=="CHECKNEWVERSIONS"){
checkNewVersions = util->trueOrFalse(value);
}
else if (field=="PROVIDEINFO"){
reportInfo = util->trueOrFalse(value);
}
else if (field=="ALWAYSADIF")
{
alwaysADIF = util->trueOrFalse(value);
}
else if (field=="DEBUGLOG")
{
if (util->trueOrFalse(value))
{ {
logSeverity = Info; logSeverity = Info;
logEvent(Q_FUNC_INFO, "Log enabled"); logEvent(Q_FUNC_INFO, "Log enabled");
@ -5094,246 +4984,76 @@ bool MainWindow::processConfigLine(const QString &_line){
logEvent(Q_FUNC_INFO, "Log disabled"); logEvent(Q_FUNC_INFO, "Log disabled");
logSeverity = Info; logSeverity = Info;
} }
} mainQSOEntryWidget->setUTC(config.value("utctime").toBool());
else if (field=="UTCTIME") sendQSLByDefault = config.value("sendeqslbydefault").toBool();
{
//qDebug() << "MainWindow::processConfigLine: UTCTIME: " << value.toUpper() <<endl;
//UTCTime = util->trueOrFalse(value);
mainQSOEntryWidget->setUTC(util->trueOrFalse(value));
}
else if (field=="SENDEQSLBYDEFAULT")
{
sendQSLByDefault=util->trueOrFalse(value);
eQSLTabWidget->setQueueSentByDefault(sendQSLByDefault); eQSLTabWidget->setQueueSentByDefault(sendQSLByDefault);
}
else if (field=="DUPLICATEDQSOSLOT"){ if (config.value("duplicatedqsoslot").toInt()>=0)
if (value.toInt()>=0)
{ {
dupeSlotInSeconds = value.toInt(); dupeSlotInSeconds = config.value("duplicatedqsoslot").toInt();
filemanager->setDuplicatedQSOSlot(dupeSlotInSeconds); filemanager->setDuplicatedQSOSlot(dupeSlotInSeconds);
mainQSOEntryWidget->setDuplicatedQSOSlot(dupeSlotInSeconds); mainQSOEntryWidget->setDuplicatedQSOSlot(dupeSlotInSeconds);
} }
completeWithPrevious = config.value("completewithprevious").toBool();
dxClusterWidget->setSaveSpots(config.value("DXC/save").toBool());
dxClusterShowHF = config.value("DXC/showhf").toBool();
dxClusterShowVHF = config.value("DXC/showvhf").toBool();
dxClusterShowWARC = config.value("DXC/showwarc").toBool();
dxClusterShowWorked = config.value("DXC/showworked").toBool();
dxClusterShowConfirmed = config.value("DXC/showconfirmed").toBool();
dxClusterShowAnn = config.value("DXC/showann").toBool();
dxClusterShowWWV = config.value("DXC/showwwn").toBool();
dxClusterShowWCY = config.value("DXC/showwcy").toBool();
defaultADIFLogFile = config.value("defaultadiffile").toString().toLower();
if ( locator->isValidLocator(config.value("userdata/stationlocator").toString()) )
{
myDataTabWidget->setMyLocator(config.value("userdata/stationlocator").toString().toUpper());
} }
else if (field=="COMPLETEWITHPREVIOUS") newOneColor.setNamedColor(config.value("colors/newone").toString());
{ neededColor.setNamedColor(config.value("colors/needed").toString());
completeWithPrevious = util->trueOrFalse(value); workedColor.setNamedColor(config.value("colors/worked").toString());
} confirmedColor.setNamedColor(config.value("colors/confirmed").toString());
else if (field=="DXCLUSTERSAVE") defaultColor.setNamedColor(config.value("colors/default").toString());
{
dxClusterWidget->setSaveSpots(util->trueOrFalse(value));
}
else if (field=="DXCLUSTERSHOWHF")
{
dxClusterShowHF = util->trueOrFalse(value);
}
else if (field=="DXCLUSTERSHOWVHF") UDPServerStart = config.value("udpserver/active").toBool();
{ UDPLogServer->setNetworkInterface(config.value("udpserver/interface").toString());
dxClusterShowVHF = util->trueOrFalse(value); UDPLogServer->setPort(config.value("udpserver/port").toInt());
} infoTimeout = config.value("wsjtx/infotimeout").toInt();
else if (field=="DXCLUSTERSHOWWARC") hamlib->setModelId(config.value("hamlib/rigtype").toInt());
{ hamlib->setPort(config.value("hamlib/serialport").toString());
dxClusterShowWARC = util->trueOrFalse(value); hamlib->setSpeed(config.value("hamlib/serialbauds").toString());
} hamlib->setData(config.value("hamlib/serialdatabits").toString());
hamlib->setStop(config.value("hamlib/serialstopbits").toString());
hamlib->setFlow(config.value("hamlib/serialflowcontrol").toString());
hamlib->setParity(config.value("hamlib/serialparity").toString());
hamlib->setPoll(config.value("hamlib/pollrate").toInt());
hamlibActive = config.value("hamlib/active").toInt();
hamlib->setReadOnly(config.value("hamlib/readonly").toBool());
hamlib->setNetworkAddress(config.value("hamlib/netaddress").toString());
hamlib->setNetworkPort(config.value("hamlib/netport").toInt());
else if (field=="DXCLUSTERSHOWWORKED") UDPLogServer->setRealTimeUpdate(config.value("wsjtx/realtimefromwsjtx").toBool());
{ currentLog = config.value("selectedlog").toInt();
dxClusterShowWorked = util->trueOrFalse(value);
}
else if (field=="DXCLUSTERSHOWCONFIRMED")
{
dxClusterShowConfirmed = util->trueOrFalse(value);
}
else if (field=="DXCLUSTERSHOWANN")
{
dxClusterShowAnn = util->trueOrFalse(value);
}
else if (field=="DXCLUSTERSHOWWWV")
{
dxClusterShowWWV = util->trueOrFalse(value);
}
else if (field=="DXCLUSTERSHOWWCY")
{
dxClusterShowWCY = util->trueOrFalse(value);
}
else if (field=="DEFAULTADIFFILE")
{
defaultADIFLogFile = value.toLower();
//qDebug() << "MainWindow::processConfigLine: " << defaultADIFLogFile << Qt::endl;
}
else if (field=="STATIONLOCATOR")
{
if ( locator->isValidLocator(value) )
{
//myLocator = ;
myDataTabWidget->setMyLocator(value.toUpper());
}
}
else if(field=="NEWONECOLOR")
{
newOneColor.setNamedColor(value);
}
else if(field=="NEEDEDCOLOR")
{
neededColor.setNamedColor(value);
}
else if(field=="WORKEDCOLOR")
{
workedColor.setNamedColor(value);
}
else if(field=="CONFIRMEDCOLOR")
{
confirmedColor.setNamedColor(value);
}
else if(field=="DEFAULTCOLOR")
{
defaultColor.setNamedColor(value);
}
//else if (field=="PSTROTATORACTIVE")
//{
//usePSTRotator = true;
//}
//else if (field=="PSTROTATORPORT")
//{
// pstRotator->setPort(value.toInt());
//}
//else if (field=="PSTROTATORSERVER")
//{
// pstRotator->setServer(value);
//}
else if (field=="UDPSERVER")
{
//qDebug() << "MainWindow::processConfigLine: UDPSERVER: " << value.toUpper() << Qt::endl;
UDPServerStart = util->trueOrFalse(value);
}
else if (field=="UDPNETWORKINTERFACE")
{
UDPLogServer->setNetworkInterface(value);
}
else if (field=="UDPSERVERPORT")
{
UDPLogServer->setPort(value.toInt());
}
else if (field=="INFOTIMEOUT")
{
int a = value.toInt();
if ((a>0) && (a<=65535))
{
infoTimeout = a;
}
}
else if (field=="LOGFROMWSJTX")
{
UDPLogServer->setLogging(util->trueOrFalse(value));
}
else if (field=="LOGAUTOFROMWSJTX")
{
wsjtxAutoLog = util->trueOrFalse(value);
}
else if (field == "HAMLIBRIGTYPE" )
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBRIGTYPE: " << value << Qt::endl;
hamlib->setModelId(value.toInt());
//qDebug() << "MainWindow::processConfigLine: HAMLIBRIGTYPE: " << value << Qt::endl;
}
else if(field == "HAMLIBSERIALPORT")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALPORT: " << value << Qt::endl;
hamlib->setPort(value);
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALPORT: " << value << Qt::endl;
}
else if (field == "HAMLIBSERIALBAUDS")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALBAUDS: " << value << Qt::endl;
hamlib->setSpeed(value);
//qDebug() << "MainWindow::processConfigLine: HAMLIBSERIALBAUDS: " << value << Qt::endl;
}else if(field =="HAMLIBSERIALDATABITS"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALDATABITS: " << value << Qt::endl;
hamlib->setData(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALDATABITS: " << value << Qt::endl;
}else if(field =="HAMLIBSERIALSTOPBITS"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALSTOPBITS: " << value << Qt::endl;
hamlib->setStop(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALSTOPBITS: " << value << Qt::endl;
}else if(field =="HAMLIBSERIALFLOWCONTROL"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALFLOWCONTROL: " << value << Qt::endl;
hamlib->setFlow(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALFLOWCONTROL: " << value << Qt::endl;
}else if(field =="HAMLIBSERIALPARITY"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALPARITY: " << value << Qt::endl;
hamlib->setParity(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALPARITY: " << value << Qt::endl;
}else if(field =="HAMLIBSERIALRTS"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALRTS: " << value << Qt::endl;
//hamlib->setRTS(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALRTS: " << value << Qt::endl;
}else if(field =="HAMLIBSERIALDTR"){
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALDTR: " << value << Qt::endl;
//hamlib->setDTR(value);
//qDebug() << "SetupDialog::processConfigLine: HAMLIBSERIALDTR: " << value << Qt::endl;
}else if (field == "HAMLIBRIGPOLLRATE"){
hamlib->setPoll(value.toInt());
}else if (field == "HAMLIB")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIB: " << value << Qt::endl;
hamlibActive = util->trueOrFalse(value);
//qDebug() << "MainWindow::processConfigLine: HAMLIB: " << value << Qt::endl;
}
else if (field == "HAMLIBREADONLY")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBREADONLY: " << value << Qt::endl;
hamlib->setReadOnly(util->trueOrFalse(value));
}
else if (field == "HAMLIBNETADDRESS"){
//hamlibPage->setRadioNetworkAddress (value);
hamlib->setNetworkAddress (value);
}
else if (field == "HAMLIBNETPORT"){
hamlib->setNetworkPort (value.toInt ());
//hamlibPage->setRadioNetworkPort (value.toInt ());
}
else if (field=="REALTIMEFROMWSJTX")
{
//qDebug() << "MainWindow::processConfigLine: REALTIMEFROMWSJTX: " << value << Qt::endl;
UDPLogServer->setRealTimeUpdate(util->trueOrFalse(value));
}
else if(field=="SELECTEDLOG")
{
currentLog = value.toInt();
//qDebug() << "MainWindow::processConfigLine: currentLog - SelectedLog: " << QString::number(currentLog) << Qt::endl;
//if ( ((dataProxy->doesThisLogExist(currentLog)) && (dataProxy->getHowManyQSOInLog(currentLog) > 0)) )
if ( ((dataProxy->doesThisLogExist(currentLog)) ) ) if ( ((dataProxy->doesThisLogExist(currentLog)) ) )
{ {
//qDebug() << "MainWindow::processConfigLine: currentLog - Log with QSO - SelectedLog: " << QString::number(currentLog) << Qt::endl; //qDebug() << "MainWindow::processConfigLine: currentLog - Log with QSO - SelectedLog: " << QString::number(currentLog);
} }
else else
{ {
int _howManyQSOMax = -1; // NUmber of QSO of the log with more QSO int _howManyQSOMax = -1; // NUmber of QSO of the log with more QSO
int _howManyQSOMaxT = 0; // Number of QSO in ine specific log int _howManyQSOMaxT = 0; // Number of QSO in ine specific log
QStringList logs = QStringList(); QStringList logs = QStringList();
logs << dataProxy->getListOfManagedLogs(); logs << dataProxy->getListOfManagedLogs();
//qDebug() << "MainWindow::processConfigLine: logs: " << QString::number(logs.size()) << Qt::endl; //qDebug() << "MainWindow::processConfigLine: logs: " << QString::number(logs.size()) << endl;
for (int i = 0;i<logs.length();i++) for (int i = 0;i<logs.length();i++)
{ {
_howManyQSOMaxT = dataProxy->getHowManyQSOInLog(i); _howManyQSOMaxT = dataProxy->getHowManyQSOInLog(i);
//qDebug() << "MainWindow::processConfigLine: SelectedLog-x: " << QString::number(i) << " - QSOs: " << QString::number(_howManyQSOMaxT) << Qt::endl; //qDebug() << "MainWindow::processConfigLine: SelectedLog-x: " << QString::number(i) << " - QSOs: " << QString::number(_howManyQSOMaxT) << endl;
if (_howManyQSOMax < _howManyQSOMaxT) if (_howManyQSOMax < _howManyQSOMaxT)
{ {
//qDebug() << "MainWindow::processConfigLine: Found log with more QSO: " << logs.at(i) << Qt::endl; //qDebug() << "MainWindow::processConfigLine: Found log with more QSO: " << logs.at(i) << endl;
_howManyQSOMax = _howManyQSOMaxT; _howManyQSOMax = _howManyQSOMaxT;
_logWithMoreQSOs = (logs.at(i)).toInt(); _logWithMoreQSOs = (logs.at(i)).toInt();
} }
@ -5341,12 +5061,11 @@ bool MainWindow::processConfigLine(const QString &_line){
if (_logWithMoreQSOs>0) if (_logWithMoreQSOs>0)
{ {
currentLog = _logWithMoreQSOs; currentLog = _logWithMoreQSOs;
filemanager->modifySetupFile(configFileName, "SelectedLog", QString::number(currentLog)); config.setValue("selectedlog", QString::number(currentLog));
} }
else else
{ {
QMessageBox msgBox; QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Critical); msgBox.setIcon(QMessageBox::Critical);
QString aux = tr("It seems that there are no QSOs in the database.") + "\n\n" + tr("If you are sure that the database contains QSOs and KLog is not able to find them, please contact the developers (see About KLog) for help."); QString aux = tr("It seems that there are no QSOs in the database.") + "\n\n" + tr("If you are sure that the database contains QSOs and KLog is not able to find them, please contact the developers (see About KLog) for help.");
msgBox.setText(aux); msgBox.setText(aux);
@ -5362,84 +5081,32 @@ bool MainWindow::processConfigLine(const QString &_line){
break; break;
} }
} }
}
dxClusterWidget->setCurrentLog(currentLog); dxClusterWidget->setCurrentLog(currentLog);
dxccStatusWidget->setCurrentLog(currentLog); dxccStatusWidget->setCurrentLog(currentLog);
//qDebug() << "MainWindow::processConfigLine: currentLog: " << value << Qt::endl; //qDebug() << "MainWindow::processConfigLine: currentLog: " << value << endl;
}
else if(field=="CLUBLOGACTIVE") clublogActive = config.value("clublog/active").toBool();
{
//qDebug() << "MainWindow::processConfigLine: clublogActive: " << value << Qt::endl;
clublogActive = util->trueOrFalse(value);
setupDialog->setClubLogActive(clublogActive); setupDialog->setClubLogActive(clublogActive);
} clublogRealTime = config.value("clublog/realtime").toBool();
else if(field=="CLUBLOGREALTIME") clublogPass = config.value("clublog/pass").toString();
{ clublogEmail = config.value("clublog/email").toString();
//qDebug() << "MainWindow::processConfigLine: clublogRealTime: " << value << Qt::endl;
clublogRealTime = util->trueOrFalse(value); qrzcomActive = config.value("qrzcom/active").toBool();
}
else if(field=="CLUBLOGPASS")
{
//qDebug() << "MainWindow::processConfigLine: clublogPass: " << value << Qt::endl;
clublogPass = value;
}
else if(field=="CLUBLOGEMAIL")
{
//qDebug() << "MainWindow::processConfigLine: clublogEmail: " << value << Qt::endl;
clublogEmail = value;
}
else if(field=="QRZCOMACTIVE")
{
qrzcomActive = util->trueOrFalse(value);
setupDialog->setQRZCOMAutoCheckActive(QRZCOMAutoCheckAct->isChecked()); setupDialog->setQRZCOMAutoCheckActive(QRZCOMAutoCheckAct->isChecked());
//slotElogQRZCOMAutoCheck(); QRZCOMAutoCheckAct->setChecked(config.value("qrzcom/auto").toBool());
} setupDialog->setQRZCOMAutoCheckActive(config.value("qrzcom/auto").toBool());
else if(field =="QRZCOMAUTO") qrzcomPass = config.value("qrzcom/pass").toString();
{ qrzcomUser = config.value("qrzcom/user").toString();
//qDebug() << "MainWindow::processConfigLine: QRZCOMAuto: " << value << Qt::endl; elogQRZcom->setLogBookKey(config.value("qrzcom/logbookkey").toString());
//qDebug() << "MainWindow::processConfigLine: QRZCOMAuto was: " << util->boolToQString(QRZCOMAutoCheckAct->isChecked()) << Qt::endl;
QRZCOMAutoCheckAct->setChecked(util->trueOrFalse(value)); eQSLActive = config.value("eqsl/active").toBool();
setupDialog->setQRZCOMAutoCheckActive(util->trueOrFalse(value));
//qDebug() << "MainWindow::processConfigLine: QRZCOMAuto is: " << util->boolToQString(QRZCOMAutoCheckAct->isChecked()) << Qt::endl;
}
else if(field=="QRZCOMPASS")
{
qrzcomPass = value;
}
else if(field=="QRZCOMUSER")
{
qrzcomUser = value;
}
else if (field =="QRZCOMLOGBOOKKEY"){
elogQRZcom->setLogBookKey(value);
}
else if(field =="EQSLACTIVE"){
eQSLActive = util->trueOrFalse(value);
setupDialog->setEQSLActive(eQSLActive); setupDialog->setEQSLActive(eQSLActive);
//qDebug() << "MainWindow::processConfigLine - EQSLACTIVE" << Qt::endl; eQSLRealTime = config.value("eqsl/realtime").toBool();
} eqslUtilities->setUser(config.value("eqsl/call").toString());
else if(field =="EQSLREALTIME"){ eqslUtilities->setPass(config.value("eqsl/pass").toString());
eQSLRealTime = util->trueOrFalse(value); eQSLUseQSOStationCallSign = config.value("eqsl/usestationcallsign").toBool();
//qDebug() << "MainWindow::processConfigLine - EQSLREALTIME" << Qt::endl; if (config.value("lotw/active").toBool())
}
else if(field =="EQSLCALL"){
//qDebug() << "MainWindow::processConfigLine - EQSLPASS" << Qt::endl;
eqslUtilities->setUser(value);
}
else if(field =="EQSLPASS"){
//qDebug() << "MainWindow::processConfigLine - EQSLPASS" << Qt::endl;
eqslUtilities->setPass(value);
}
else if(field =="EQSLUSESTATIONCALLSIGN"){
//qDebug() << "MainWindow::processConfigLine - EQSLUSESTATIONCALLSIGN" << Qt::endl;
eQSLUseQSOStationCallSign = util->trueOrFalse(value);
}
else if(field =="LOTWACTIVE"){
//qDebug() << "MainWindow::processConfigLine - LOTWACTIVE" << Qt::endl;
if (util->trueOrFalse(value))
{ {
lotwActive = true; lotwActive = true;
lotwCallTQSL->setEnabled(true); lotwCallTQSL->setEnabled(true);
@ -5451,54 +5118,18 @@ bool MainWindow::processConfigLine(const QString &_line){
lotwCallTQSL->setEnabled(false); lotwCallTQSL->setEnabled(false);
lotwCallTQSL->setWhatsThis(tr("This function is disabled. Go to the Setup->LoTW tab to enable it.")); lotwCallTQSL->setWhatsThis(tr("This function is disabled. Go to the Setup->LoTW tab to enable it."));
} }
//qDebug() << "MainWindow::processConfigLine - LOTWACTIVE-END" << Qt::endl;
} lotwTQSLpath = config.value("lotw/path").toString();
else if(field =="LOTWPATH"){ lotwUtilities->setUser(config.value("lotw/user").toString());
//qDebug() << "MainWindow::processConfigLine - LOTWPATH" << Qt::endl; lotwUtilities->setPass(config.value("lotw/pass").toString());
lotwTQSLpath = value; if (softwareVersion!=config.value("version").toString())
}
else if(field =="LOTWUSER"){
//qDebug() << "MainWindow::processConfigLine - LOTWUSER: -" << value <<"-" << Qt::endl;
lotwUtilities->setUser(value);
//qDebug() << "MainWindow::processConfigLine - AFTER LOTWUSER" << Qt::endl;
}
else if(field =="LOTWPASS"){
lotwUtilities->setPass(value);
}
else if(field=="VERSION")
{
if (softwareVersion!=value)
{ {
//qDebug() << "MainWindow::processConfigLine: NONE: " << endl;
itIsANewversion = true; itIsANewversion = true;
} }
} windowSize = config.value("window/size").toSize();
else if(field=="MAINWINDOWSIZE") deleteAlwaysAdiFile = config.value("deletealwaysadifile").toBool();
{
QStringList values;
values.clear();
values << value.split("x");
if ((values.at(0).toInt()>0) && (values.at(1).toInt()>0))
{
windowSize.setWidth(values.at(0).toInt());
windowSize.setHeight(values.at(1).toInt());
//setWindowSize(values.at(0).toInt(), values.at(1).toInt());
}
}
else if(field=="DELETEALWAYSADIFILE")
{
deleteAlwaysAdiFile = util->trueOrFalse(value);
//qDebug() << "Delete Aways Adif File = " << deleteAlwaysAdiFile <<endl;
}
else if(field=="LATESTBACKUP")
{
}
else
{
//qDebug() << "MainWindow::processConfigLine: NONE: " << Qt::endl;
}
// Lines are: Option = value;
//qDebug() << "MainWindow::processConfigLine: END" << Qt::endl; //qDebug() << "MainWindow::processConfigLine: END" << Qt::endl;
logEvent(Q_FUNC_INFO, "END", logSeverity); logEvent(Q_FUNC_INFO, "END", logSeverity);
return true; return true;

2
src/mainwindow.h
View File

@ -401,7 +401,7 @@ private:
bool createConnection(); bool createConnection();
void createData(); void createData();
void openSetup(const int _page=0); void openSetup(const int _page=0);
bool processConfigLine(const QString &_line); bool processConfigData();
void readConfigData(); void readConfigData();
void defineStationCallsign(const QString &_call); void defineStationCallsign(const QString &_call);
QString selectStationCallsign(); QString selectStationCallsign();

913
src/setupdialog.cpp
View File

File diff suppressed because it is too large Load Diff

9
src/setupdialog.h
View File

@ -59,10 +59,10 @@ class SetupDialog : public QDialog
public: public:
//SetupDialog(DataProxy_SQLite *dp, const bool _firstTime=true, QWidget *parent = nullptr); //SetupDialog(DataProxy_SQLite *dp, const bool _firstTime=true, QWidget *parent = nullptr);
SetupDialog(DataProxy_SQLite *dp, const QString &_configFile, const QString &_softwareVersion, const int _page=0, const bool _firstTime = true, QWidget *parent = nullptr); SetupDialog(DataProxy_SQLite *dp, const QString &_softwareVersion, const int _page=0, const bool _firstTime = true, QWidget *parent = nullptr);
~SetupDialog(); ~SetupDialog();
void setData(const QString &_configFile, const QString &_softwareVersion, const int _page, const bool _firstTime=true); void setData(const QString &_softwareVersion, const int _page, const bool _firstTime=true);
void setClubLogActive(const bool _b); void setClubLogActive(const bool _b);
void setEQSLActive(const bool _b); void setEQSLActive(const bool _b);
void setQRZCOMAutoCheckActive(const bool _b); void setQRZCOMAutoCheckActive(const bool _b);
@ -90,14 +90,13 @@ private slots:
private: private:
void showEvent(QShowEvent *event); void showEvent(QShowEvent *event);
void setConfigFile(const QString &_configFile);
void setSoftVersion(const QString &_softwareVersion); void setSoftVersion(const QString &_softwareVersion);
void setConfigured(const bool _configured); void setConfigured(const bool _configured);
void setPage(const int _page); void setPage(const int _page);
void connectActions(); void connectActions();
bool processConfigData();
void createIcons(); void createIcons();
bool processConfigLine(const QString &_line);
void setDefaults(); void setDefaults();
@ -141,7 +140,7 @@ private:
//SetupPageRegionalAwards *regionalAwardsPage; //SetupPageRegionalAwards *regionalAwardsPage;
int pageRequested; // The page on the Dialog that is requested to be shown when you call it int pageRequested; // The page on the Dialog that is requested to be shown when you call it
//QString klogDir; //QString klogDir;
QString configFileName, version; QString version;
QStringList bands, modes, logViewFields; QStringList bands, modes, logViewFields;
Locator *locator; Locator *locator;

10
src/setuppages/setuppagecolors.cpp
View File

@ -302,13 +302,13 @@ void SetupPageColors::slotSetDarkMode()
} }
} }
QString SetupPageColors::getDarkMode(){ bool SetupPageColors::getDarkMode()
{
return util->boolToQString(darkMode); return darkMode;
} }
void SetupPageColors::setDarkMode(const QString &_dm) void SetupPageColors::setDarkMode(const bool _dm)
{ {
darkMode = !util->trueOrFalse(_dm); darkMode = !_dm;
slotSetDarkMode(); slotSetDarkMode();
} }

4
src/setuppages/setuppagecolors.h
View File

@ -43,14 +43,14 @@ public:
QString getWorkedColor(); QString getWorkedColor();
QString getConfirmedColor(); QString getConfirmedColor();
QString getDefaultColor(); QString getDefaultColor();
QString getDarkMode(); bool getDarkMode();
void setNewOneColor(const QString &_c); void setNewOneColor(const QString &_c);
void setNeededColor(const QString &_c); void setNeededColor(const QString &_c);
void setWorkedColor(const QString &_c); void setWorkedColor(const QString &_c);
void setConfirmedColor(const QString &_c); void setConfirmedColor(const QString &_c);
void setDefaultColor(const QString &_c); void setDefaultColor(const QString &_c);
void setDarkMode(const QString &_dm); void setDarkMode(const bool _dm);

233
src/setuppages/setuppagedxcluster.cpp
View File

@ -312,239 +312,94 @@ void SetupPageDxCluster::setDxclusterServersComboBox(const QStringList t)
} }
} }
QString SetupPageDxCluster::getSaveActivityQCheckbox() bool SetupPageDxCluster::getSaveActivityQCheckbox()
{ {
if (saveAllDXClusterDataQCheckbox->isChecked()) return saveAllDXClusterDataQCheckbox->isChecked();
{
return "True";
}
else
{
return "False";
} }
bool SetupPageDxCluster::getShowHFQCheckbox()
{
return showHFQCheckbox->isChecked();
} }
QString SetupPageDxCluster::getShowHFQCheckbox() bool SetupPageDxCluster::getShowVHFQCheckbox()
{ {
return showVHFQCheckbox->isChecked();
if (showHFQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
bool SetupPageDxCluster::getShowWARCQCheckbox()
{
return showWARCQCheckbox->isChecked();
} }
QString SetupPageDxCluster::getShowVHFQCheckbox() bool SetupPageDxCluster::getShowWorkedQCheckbox()
{ {
return showWorkedQCheckbox->isChecked();
if (showVHFQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
bool SetupPageDxCluster::getShowConfirmedQCheckbox()
{
return showConfirmedQCheckbox->isChecked();
} }
QString SetupPageDxCluster::getShowWARCQCheckbox() bool SetupPageDxCluster::getShowANNQCheckbox()
{ {
return showANNQCheckbox->isChecked();
if (showWARCQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
bool SetupPageDxCluster::getShowWWVQCheckbox()
{
return showWWVQCheckbox->isChecked();
} }
QString SetupPageDxCluster::getShowWorkedQCheckbox() bool SetupPageDxCluster::getShowWCYQCheckbox()
{ {
return showWCYQCheckbox->isChecked();
if (showWorkedQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
void SetupPageDxCluster::setShowHFQCheckbox(const bool t)
{
showHFQCheckbox->setChecked(t);
} }
QString SetupPageDxCluster::getShowConfirmedQCheckbox() void SetupPageDxCluster::setShowVHFQCheckbox(const bool t)
{ {
showVHFQCheckbox->setChecked(t);
if (showConfirmedQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
void SetupPageDxCluster::setShowWARCQCheckbox(const bool t)
{
showWARCQCheckbox->setChecked(t);
} }
QString SetupPageDxCluster::getShowANNQCheckbox() void SetupPageDxCluster::setSaveActivityQCheckbox(const bool t)
{ {
saveAllDXClusterDataQCheckbox->setChecked(t);
if (showANNQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
void SetupPageDxCluster::setShowWorkedQCheckbox(const bool t)
{
showWorkedQCheckbox->setChecked(t);
} }
QString SetupPageDxCluster::getShowWWVQCheckbox() void SetupPageDxCluster::setShowConfirmedQCheckbox(const bool t)
{ {
showConfirmedQCheckbox->setChecked(t);
if (showWWVQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
void SetupPageDxCluster::setShowANNQCheckbox(const bool t)
{
showANNQCheckbox->setChecked(t);
} }
QString SetupPageDxCluster::getShowWCYQCheckbox() void SetupPageDxCluster::setShowWWVQCheckbox(const bool t)
{ {
showWWVQCheckbox->setChecked(t);
if (showWCYQCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
} }
} void SetupPageDxCluster::setShowWCYQCheckbox(const bool t)
void SetupPageDxCluster::setShowHFQCheckbox(const QString t)
{ {
if ( (t.toUpper()) == "FALSE") showWCYQCheckbox->setChecked(t);
{
showHFQCheckbox->setChecked(false);
}
else
{
showHFQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowVHFQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showVHFQCheckbox->setChecked(false);
}
else
{
showVHFQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowWARCQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showWARCQCheckbox->setChecked(false);
}
else
{
showWARCQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setSaveActivityQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
saveAllDXClusterDataQCheckbox->setChecked(false);
}
else
{
saveAllDXClusterDataQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowWorkedQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showWorkedQCheckbox->setChecked(false);
}
else
{
showWorkedQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowConfirmedQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showConfirmedQCheckbox->setChecked(false);
}
else
{
showConfirmedQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowANNQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showANNQCheckbox->setChecked(false);
}
else
{
showANNQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowWWVQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showWWVQCheckbox->setChecked(false);
}
else
{
showWWVQCheckbox->setChecked(true);
}
}
void SetupPageDxCluster::setShowWCYQCheckbox(const QString t)
{
if ( (t.toUpper()) == "FALSE")
{
showWCYQCheckbox->setChecked(false);
}
else
{
showWCYQCheckbox->setChecked(true);
}
} }
QString SetupPageDxCluster::getSelectedDxClusterServer() QString SetupPageDxCluster::getSelectedDxClusterServer()

36
src/setuppages/setuppagedxcluster.h
View File

@ -45,26 +45,26 @@ public:
QString getSelectedDxClusterServer(); QString getSelectedDxClusterServer();
void setSelectedDxClusterServer(const QString t); void setSelectedDxClusterServer(const QString t);
QString getShowHFQCheckbox(); bool getShowHFQCheckbox();
QString getShowVHFQCheckbox(); bool getShowVHFQCheckbox();
QString getShowWARCQCheckbox(); bool getShowWARCQCheckbox();
QString getShowWorkedQCheckbox(); bool getShowWorkedQCheckbox();
QString getShowConfirmedQCheckbox(); bool getShowConfirmedQCheckbox();
QString getShowANNQCheckbox(); bool getShowANNQCheckbox();
QString getShowWWVQCheckbox(); bool getShowWWVQCheckbox();
QString getShowWCYQCheckbox(); bool getShowWCYQCheckbox();
QString getSaveActivityQCheckbox(); bool getSaveActivityQCheckbox();
void setShowHFQCheckbox(const QString t); void setShowHFQCheckbox(const bool t);
void setShowVHFQCheckbox(const QString t); void setShowVHFQCheckbox(const bool t);
void setShowWARCQCheckbox(const QString t); void setShowWARCQCheckbox(const bool t);
void setShowWorkedQCheckbox(const QString t); void setShowWorkedQCheckbox(const bool t);
void setShowConfirmedQCheckbox(const QString t); void setShowConfirmedQCheckbox(const bool t);
void setShowANNQCheckbox(const QString t); void setShowANNQCheckbox(const bool t);
void setShowWWVQCheckbox(const QString t); void setShowWWVQCheckbox(const bool t);
void setShowWCYQCheckbox(const QString t); void setShowWCYQCheckbox(const bool t);
void setSaveActivityQCheckbox(const QString t); void setSaveActivityQCheckbox(const bool t);
private slots: private slots:
void slotAddButtonClicked(); void slotAddButtonClicked();

13
src/setuppages/setuppageelog.cpp
View File

@ -469,10 +469,9 @@ void SetupPageELog::setLoTWActive(const bool &_s)
//lotwPasswordLineEdit->setEnabled(_s); //lotwPasswordLineEdit->setEnabled(_s);
} }
QString SetupPageELog::getLoTWActive() bool SetupPageELog::getLoTWActive()
{ {
lotwTQSL = lotwUseTQSLCheckBox->isChecked(); return lotwUseTQSLCheckBox->isChecked();
return util->boolToQString(lotwTQSL);
} }
void SetupPageELog::setTQSLPath(const QString &c) void SetupPageELog::setTQSLPath(const QString &c)
@ -644,14 +643,12 @@ QString SetupPageELog::getQRZCOMPassword()
bool SetupPageELog::getQRZCOMAutoCheck() bool SetupPageELog::getQRZCOMAutoCheck()
{ {
qrzcomAutoFill = QRZCOMAutoCheckCheckBox->isChecked(); return QRZCOMAutoCheckCheckBox->isChecked();
return qrzcomAutoFill;
} }
void SetupPageELog::setQRZCOMAutoCheck(const QString &_s) void SetupPageELog::setQRZCOMAutoCheck(const bool &_s)
{ {
qrzcomAutoFill = util->trueOrFalse(_s); QRZCOMAutoCheckCheckBox->setChecked(_s);
QRZCOMAutoCheckCheckBox->setChecked(qrzcomAutoFill);
} }
void SetupPageELog::showEvent(QShowEvent *event) void SetupPageELog::showEvent(QShowEvent *event)

6
src/setuppages/setuppageelog.h
View File

@ -53,7 +53,7 @@ public:
void setTQSLPath(const QString &c); void setTQSLPath(const QString &c);
QString getTQSLPath(); QString getTQSLPath();
void setLoTWActive(const bool &_s); void setLoTWActive(const bool &_s);
QString getLoTWActive(); bool getLoTWActive();
void setLoTWUser(const QString &_s); void setLoTWUser(const QString &_s);
QString getLoTWUser(); QString getLoTWUser();
void setLoTWPass(const QString &_s); void setLoTWPass(const QString &_s);
@ -75,8 +75,8 @@ public:
void setQRZCOMPassword(const QString &_s); void setQRZCOMPassword(const QString &_s);
void setQRZCOMLogBookKEY(const QString &_s); void setQRZCOMLogBookKEY(const QString &_s);
void setQRZCOMActive(const QString &_s); void setQRZCOMActive(const bool &_s);
void setQRZCOMAutoCheck(const QString &_s); void setQRZCOMAutoCheck(const bool &_s);
QString getQRZCOMUser(); QString getQRZCOMUser();
QString getQRZCOMPassword(); QString getQRZCOMPassword();

33
src/setuppages/setuppagehamlib.cpp
View File

@ -24,6 +24,7 @@
* * * *
*****************************************************************************/ *****************************************************************************/
#include "setuppages/setuppagehamlib.h" #include "setuppages/setuppagehamlib.h"
#include "klogconfig.h"
SetupPageHamLib::SetupPageHamLib(DataProxy_SQLite *dp, QWidget *parent) : QWidget(parent) SetupPageHamLib::SetupPageHamLib(DataProxy_SQLite *dp, QWidget *parent) : QWidget(parent)
{ {
@ -584,21 +585,20 @@ QString SetupPageHamLib::getFlowControl()
{ {
int ret = flowControlComboBox->currentIndex(); int ret = flowControlComboBox->currentIndex();
QString output; QString output;
output = "HamLibSerialFlowControl=";
switch (ret) switch (ret)
{ {
case 0: case 0:
output = output + "None"; output = "None";
break; break;
case 1: case 1:
output = output + "Hardware"; output = "Hardware";
break; break;
case 2: case 2:
output = output + "Software"; output = "Software";
break; break;
default: default:
// should never be reached // should never be reached
output = output + "None"; output = "None";
break; break;
} }
return output; return output;
@ -625,27 +625,26 @@ QString SetupPageHamLib::getParity()
{ {
int ret = parityComboBox->currentIndex(); int ret = parityComboBox->currentIndex();
QString output; QString output;
output = "HamLibSerialParity=";
switch (ret) switch (ret)
{ {
case 0: case 0:
output = output + "None"; output = "None";
break; break;
case 1: case 1:
output = output + "Even"; output = "Even";
break; break;
case 2: case 2:
output = output + "Odd"; output = "Odd";
break; break;
case 3: case 3:
output = output + "Space"; output = "Space";
break; break;
case 4: case 4:
output = output + "Mark"; output = "Mark";
break; break;
default: default:
// should never be reached // should never be reached
output = output + "None"; output = "None";
break; break;
} }
return output; return output;
@ -681,22 +680,21 @@ QString SetupPageHamLib::getStopBits()
{ {
int ret = stopBitsComboBox->currentIndex(); int ret = stopBitsComboBox->currentIndex();
QString output; QString output;
output = "HamLibSerialStopBits=";
switch (ret) switch (ret)
{ {
case 0: case 0:
output = output + "1"; output = "1";
break; break;
case 1: case 1:
output = output + "1.5"; output = "1.5";
break; break;
case 2: case 2:
output = output + "2"; output = "2";
break; break;
default: default:
// should never be reached // should never be reached
output = output + "1"; output = "1";
break; break;
} }
return output; return output;
@ -705,7 +703,6 @@ void SetupPageHamLib::setStopBits(const QString &_st)
{ {
if (_st == "1.5") if (_st == "1.5")
{ {
stopBitsComboBox->setCurrentIndex(1); stopBitsComboBox->setCurrentIndex(1);
} }
else if (_st == "2") else if (_st == "2")

9
src/setuppages/setuppagehamlib.h
View File

@ -39,12 +39,13 @@ class SetupPageHamLib : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit SetupPageHamLib(DataProxy_SQLite *dp, QWidget *parent = nullptr); explicit SetupPageHamLib(DataProxy_SQLite *dp, QWidget *parent = nullptr);
QString getData();
bool setRigType(const QString &_radio); bool setRigType(const QString &_radio);
void setPollingInterval(const int _msecs); void setPollingInterval(const int _msecs);
bool setSerialPort(const QString &_port); bool setSerialPort(const QString &_port);
bool setSerialSpeed(const QString &_speed ); bool setSerialSpeed(const QString &_speed );
void setActive(const QString &_active); void setActive(const bool &_active);
bool isActive();
bool isReadOnly();
//void setRTS(const QString &_state); //void setRTS(const QString &_state);
//void setDTR(const QString &_state); //void setDTR(const QString &_state);
void setDataBits(const QString &_st); void setDataBits(const QString &_st);
@ -52,10 +53,10 @@ public:
void setParity(const QString &_st); void setParity(const QString &_st);
void setStopBits(const QString &_st); void setStopBits(const QString &_st);
//void setPollInterval(const QString &_st); //void setPollInterval(const QString &_st);
void setReadOnly(const QString &_m); void setReadOnly(const bool &_m);
void setRadioNetworkAddress(const QString &_m); void setRadioNetworkAddress(const QString &_m);
void setRadioNetworkPort(const int _p); void setRadioNetworkPort(const int _p);
void saveConfig();
signals: signals:

104
src/setuppages/setuppagemisc.cpp
View File

@ -208,50 +208,50 @@ void SetupPageMisc::setDeleteAlwaysAdiFile(const bool &_t){
//qDebug() << "SetupPageMisc::setDeleteAlwaysAdiFile - DELETEALWAYSADIFILE = " << _t << Qt::endl; //qDebug() << "SetupPageMisc::setDeleteAlwaysAdiFile - DELETEALWAYSADIFILE = " << _t << Qt::endl;
} }
QString SetupPageMisc::getDeleteAlwaysAdiFile(){ bool SetupPageMisc::getDeleteAlwaysAdiFile(){
return util->boolToQString(deleteAlwaysAdiFileCheckBox->isChecked()); return deleteAlwaysAdiFileCheckBox->isChecked();
} }
QString SetupPageMisc::getSendEQSLByDefault(){ bool SetupPageMisc::getSendEQSLByDefault(){
return util->boolToQString(sendEQSLByDefaultSearchCheckBox->isChecked()); return sendEQSLByDefaultSearchCheckBox->isChecked();
} }
void SetupPageMisc::setSetEQSLByDefault(const QString &_t){ void SetupPageMisc::setSetEQSLByDefault(const bool &_t){
sendEQSLByDefaultSearchCheckBox->setChecked(util->trueOrFalse(_t)); sendEQSLByDefaultSearchCheckBox->setChecked(_t);
} }
QString SetupPageMisc::getRealTime(){ bool SetupPageMisc::getRealTime(){
return util->boolToQString(realTimeCheckbox->isChecked()); return realTimeCheckbox->isChecked();
} }
void SetupPageMisc::setRealTime(const QString &_t) void SetupPageMisc::setRealTime(const bool &_t)
{ {
realTimeCheckbox->setChecked(util->trueOrFalse(_t)); realTimeCheckbox->setChecked(_t);
} }
QString SetupPageMisc::getUTCTime(){ bool SetupPageMisc::getUTCTime(){
return util->boolToQString(UTCCheckbox->isChecked()); return UTCCheckbox->isChecked();
} }
void SetupPageMisc::setUTCTime(const QString &_t) void SetupPageMisc::setUTCTime(const bool &_t)
{ {
UTCCheckbox->setChecked(util->trueOrFalse(_t)); UTCCheckbox->setChecked(_t);
} }
QString SetupPageMisc::getAlwaysADIF() bool SetupPageMisc::getAlwaysADIF()
{ {
return util->boolToQString(alwaysADIFCheckBox->isChecked()); return alwaysADIFCheckBox->isChecked();
} }
void SetupPageMisc::setAlwaysADIF(const QString &_t) void SetupPageMisc::setAlwaysADIF(const bool &_t)
{ // Defaul value is false { // Defaul value is false
alwaysADIFCheckBox->setChecked(util->trueOrFalse(_t)); alwaysADIFCheckBox->setChecked(_t);
} }
QString SetupPageMisc::getDefaultFileName() QString SetupPageMisc::getDefaultFileName()
@ -278,24 +278,24 @@ void SetupPageMisc::slotOpenFileButtonClicked()
} }
QString SetupPageMisc::getUseDefaultName() bool SetupPageMisc::getUseDefaultName()
{ {
return util->boolToQString(useDefaultName->isChecked()); return useDefaultName->isChecked();
} }
void SetupPageMisc::setUseDefaultName(const QString &_t) void SetupPageMisc::setUseDefaultName(const bool &_t)
{ {
useDefaultName->setChecked(util->trueOrFalse(_t)); useDefaultName->setChecked(_t);
} }
QString SetupPageMisc::getImperial() bool SetupPageMisc::getImperial()
{ {
return util->boolToQString(imperialCheckBox->isChecked()); return imperialCheckBox->isChecked();
} }
void SetupPageMisc::setImperial(const QString &_t) void SetupPageMisc::setImperial(const bool &_t)
{ {
imperialCheckBox->setChecked(util->trueOrFalse(_t)); imperialCheckBox->setChecked(_t);
} }
@ -316,25 +316,25 @@ void SetupPageMisc::slotUseDefaultButtonStateChanged(int state)
} }
} }
QString SetupPageMisc::getSendQSLWhenRec() bool SetupPageMisc::getSendQSLWhenRec()
{ {
return util->boolToQString(sendQSLWhenRecCheckBox->isChecked()); return sendQSLWhenRecCheckBox->isChecked();
} }
void SetupPageMisc::setSendQSLWhenRec(const QString &_t) void SetupPageMisc::setSendQSLWhenRec(const bool &_t)
{ {
sendQSLWhenRecCheckBox->setChecked(util->trueOrFalse(_t)); sendQSLWhenRecCheckBox->setChecked(_t);
} }
QString SetupPageMisc::getShowStationCallSignInSearch() bool SetupPageMisc::getShowStationCallSignInSearch()
{ {
return util->boolToQString(showStationCallWhenSearchCheckBox->isChecked()); return showStationCallWhenSearchCheckBox->isChecked();
} }
void SetupPageMisc::setShowStationCallSignInSearch(const QString &_t) void SetupPageMisc::setShowStationCallSignInSearch(const bool &_t)
{ {
showStationCallWhenSearchCheckBox->setChecked(util->trueOrFalse(_t)); showStationCallWhenSearchCheckBox->setChecked(_t);
} }
/* /*
@ -349,14 +349,14 @@ void SetupPageMisc::setKeepMyData(const QString &_t)
} }
*/ */
QString SetupPageMisc::getCompleteWithPrevious() bool SetupPageMisc::getCompleteWithPrevious()
{ {
return util->boolToQString(completeWithPreviousCheckBox->isChecked()); return completeWithPreviousCheckBox->isChecked();
} }
void SetupPageMisc::setCompleteWithPrevious(const QString &_t) void SetupPageMisc::setCompleteWithPrevious(const bool &_t)
{ {
completeWithPreviousCheckBox->setChecked(util->trueOrFalse(_t)); completeWithPreviousCheckBox->setChecked(_t);
} }
@ -374,14 +374,14 @@ void SetupPageMisc::slotcheckNewVersionCheckBoxClicked()
} }
} }
QString SetupPageMisc::getCheckNewVersions() bool SetupPageMisc::getCheckNewVersions()
{ {
return util->boolToQString(checkNewVersionCheckBox->isChecked()); return checkNewVersionCheckBox->isChecked();
} }
void SetupPageMisc::setCheckNewVersions(const QString &_t) void SetupPageMisc::setCheckNewVersions(const bool &_t)
{ {
checkNewVersionCheckBox->setChecked(util->trueOrFalse(_t)); checkNewVersionCheckBox->setChecked(_t);
} }
bool SetupPageMisc::getReportInfo() bool SetupPageMisc::getReportInfo()
@ -389,9 +389,9 @@ bool SetupPageMisc::getReportInfo()
return checkNewVersionCheckBox->isChecked(); return checkNewVersionCheckBox->isChecked();
} }
void SetupPageMisc::setReportInfo(const QString &_t) void SetupPageMisc::setReportInfo(const bool &_t)
{ {
provideCallCheckBox->setChecked(util->trueOrFalse(_t)); provideCallCheckBox->setChecked(_t);
} }
QString SetupPageMisc::getDefaultDBPath() QString SetupPageMisc::getDefaultDBPath()
@ -408,23 +408,23 @@ void SetupPageMisc::setUseDefaultDBPath(const QString &_t)
} }
QString SetupPageMisc::getDXMarathon(){ bool SetupPageMisc::getDXMarathon(){
return util->boolToQString(useDxMarathonCheckBox->isChecked()); return useDxMarathonCheckBox->isChecked();
} }
void SetupPageMisc::setDXMarathon(const QString &_t){ void SetupPageMisc::setDXMarathon(const bool &_t){
//QString st = t; //QString st = t;
useDxMarathonCheckBox->setChecked(util->trueOrFalse(_t)); useDxMarathonCheckBox->setChecked(_t);
} }
QString SetupPageMisc::getDebugLog() bool SetupPageMisc::getDebugLog()
{ {
return util->boolToQString(debugLogCheckBox->isChecked()); return debugLogCheckBox->isChecked();
} }
void SetupPageMisc::setDebugLog(const QString &_t) void SetupPageMisc::setDebugLog(const bool &_t)
{ {
debugLogCheckBox->setChecked(util->trueOrFalse(_t)); debugLogCheckBox->setChecked(_t);
} }

52
src/setuppages/setuppagemisc.h
View File

@ -37,44 +37,44 @@ public:
SetupPageMisc(QWidget *parent=nullptr); SetupPageMisc(QWidget *parent=nullptr);
~SetupPageMisc(); ~SetupPageMisc();
QString getRealTime(); bool getRealTime();
void setRealTime(const QString &_t); void setRealTime(const bool &_t);
QString getUTCTime(); bool getUTCTime();
void setUTCTime(const QString &_t); void setUTCTime(const bool &_t);
QString getAlwaysADIF(); bool getAlwaysADIF();
void setAlwaysADIF(const QString &_t); void setAlwaysADIF(const bool &_t);
QString getDefaultFileName(); QString getDefaultFileName();
void setUseDefaultName(const QString &_t); void setUseDefaultName(const bool &_t);
QString getDefaultDBPath(); QString getDefaultDBPath();
void setUseDefaultDBPath(const QString &_t); void setUseDefaultDBPath(const QString &_t);
QString getUseDefaultName(); bool getUseDefaultName();
void setDefaultFileName(const QString &_t); void setDefaultFileName(const QString &_t);
//QString getInMemory(); //QString getInMemory();
//void setInMemory(const QString &_t); //void setInMemory(const QString &_t);
QString getImperial(); bool getImperial();
void setImperial(const QString &_t); void setImperial(const bool &_t);
QString getSendQSLWhenRec(); bool getSendQSLWhenRec();
void setSendQSLWhenRec(const QString &_t); void setSendQSLWhenRec(const bool &_t);
QString getShowStationCallSignInSearch(); bool getShowStationCallSignInSearch();
void setShowStationCallSignInSearch(const QString &_t); void setShowStationCallSignInSearch(const bool &_t);
//QString getKeepMyData(); //QString getKeepMyData();
//void setKeepMyData(const QString &_t); //void setKeepMyData(const QString &_t);
QString getCompleteWithPrevious(); bool getCompleteWithPrevious();
void setCompleteWithPrevious(const QString &_t); void setCompleteWithPrevious(const bool &_t);
QString getCheckNewVersions(); bool getCheckNewVersions();
void setCheckNewVersions(const QString &_t); void setCheckNewVersions(const bool &_t);
bool getReportInfo(); bool getReportInfo();
void setReportInfo(const QString &_t); void setReportInfo(const bool &_t);
QString getDXMarathon(); bool getDXMarathon();
void setDXMarathon(const QString &_t); void setDXMarathon(const bool &_t);
QString getDebugLog(); bool getDebugLog();
void setDebugLog(const QString &_t); void setDebugLog(const bool &_t);
//QString getLogSort(); //QString getLogSort();
//void setLogSort(const QString &_t); //void setLogSort(const QString &_t);
QString getSendEQSLByDefault(); bool getSendEQSLByDefault();
void setSetEQSLByDefault(const QString &_t); void setSetEQSLByDefault(const bool &_t);
void setDeleteAlwaysAdiFile(const bool &_t); void setDeleteAlwaysAdiFile(const bool &_t);
QString getDeleteAlwaysAdiFile(); bool getDeleteAlwaysAdiFile();
void setDupeTime(const int _t); void setDupeTime(const int _t);
int getDupeTime(); int getDupeTime();

24
src/setuppages/setuppageudp.cpp
View File

@ -283,35 +283,35 @@ QString SetupPageUDP::getTimeout()
} }
} }
QString SetupPageUDP::getLogFromWSJTx() bool SetupPageUDP::getLogFromWSJTx()
{ {
return util->boolToQString(logFromWSJTXCheckbox->isChecked()); return logFromWSJTXCheckbox->isChecked();
} }
QString SetupPageUDP::getAutoLogFromWSJTx() bool SetupPageUDP::getAutoLogFromWSJTx()
{ {
return util->boolToQString(logAutomaticallyWSJTXCheckbox->isChecked()); return logAutomaticallyWSJTXCheckbox->isChecked();
} }
QString SetupPageUDP::getReaDataFromWSJTx() bool SetupPageUDP::getReaDataFromWSJTx()
{ {
return util->boolToQString(realDataFromWSJTXCheckbox->isChecked()); return realDataFromWSJTXCheckbox->isChecked();
} }
void SetupPageUDP::setLogFromWSJTx(const QString &_t) void SetupPageUDP::setLogFromWSJTx(const bool &_t)
{ {
logFromWSJTXCheckbox->setChecked(util->trueOrFalse(_t)); logFromWSJTXCheckbox->setChecked(_t);
slotLogFromWSJTCheckBoxClicked(); slotLogFromWSJTCheckBoxClicked();
} }
void SetupPageUDP::setAutoLogFromWSJTx(const QString &_t) void SetupPageUDP::setAutoLogFromWSJTx(const bool &_t)
{ {
logAutomaticallyWSJTXCheckbox->setChecked(util->trueOrFalse(_t)); logAutomaticallyWSJTXCheckbox->setChecked(_t);
} }
void SetupPageUDP::setReaDataFromWSJTx(const QString &_t) void SetupPageUDP::setReaDataFromWSJTx(const bool &_t)
{ {
realDataFromWSJTXCheckbox->setChecked(util->trueOrFalse(_t)); realDataFromWSJTXCheckbox->setChecked(_t);
} }
QString SetupPageUDP::getNetworkInterface() QString SetupPageUDP::getNetworkInterface()

16
src/setuppages/setuppageudp.h
View File

@ -39,19 +39,19 @@ public:
SetupPageUDP(QWidget *parent = nullptr); SetupPageUDP(QWidget *parent = nullptr);
~SetupPageUDP(); ~SetupPageUDP();
void setLogFromWSJTx(const QString &_t); void setLogFromWSJTx(const bool &_t);
void setAutoLogFromWSJTx(const QString &_t); void setAutoLogFromWSJTx(const bool &_t);
void setReaDataFromWSJTx(const QString &_t); void setReaDataFromWSJTx(const bool &_t);
void setUDPServer(const QString &_t); void setUDPServer(const bool &_t);
void setUDPServerPort(const QString &_t); void setUDPServerPort(const QString &_t);
void setTimeout(const QString &_t); void setTimeout(const QString &_t);
void setNetworkInterface(const QString &_t); void setNetworkInterface(const QString &_t);
QString getLogFromWSJTx(); bool getLogFromWSJTx();
QString getAutoLogFromWSJTx(); bool getAutoLogFromWSJTx();
QString getReaDataFromWSJTx(); bool getReaDataFromWSJTx();
QString getUDPServerPort(); QString getUDPServerPort();
QString getUDPServer(); bool getUDPServer();
QString getTimeout(); QString getTimeout();
QString getNetworkInterface(); QString getNetworkInterface();

2
src/src.pro
View File

@ -74,6 +74,7 @@ HEADERS += setupdialog.h \
lotwutilities.h \ lotwutilities.h \
mainqsoentrywidget.h \ mainqsoentrywidget.h \
mainwindow.h \ mainwindow.h \
klogconfig.h \
inputwidgets/mainwindowinputqso.h \ inputwidgets/mainwindowinputqso.h \
inputwidgets/mainwindowinputcomment.h \ inputwidgets/mainwindowinputcomment.h \
inputwidgets/mainwindowmydatatab.h \ inputwidgets/mainwindowmydatatab.h \
@ -161,6 +162,7 @@ SOURCES += main.cpp \
lotwutilities.cpp \ lotwutilities.cpp \
mainqsoentrywidget.cpp \ mainqsoentrywidget.cpp \
mainwindow.cpp \ mainwindow.cpp \
klogconfig.cpp \
inputwidgets/mainwindowinputqso.cpp \ inputwidgets/mainwindowinputqso.cpp \
inputwidgets/mainwindowinputcomment.cpp \ inputwidgets/mainwindowinputcomment.cpp \
inputwidgets/mainwindowmydatatab.cpp \ inputwidgets/mainwindowmydatatab.cpp \

2
src/tipsdialog.cpp
View File

@ -169,7 +169,7 @@ void TipsDialog::setTip(const int _t)
break; break;
case 5: case 5:
description = tr("<b>Tip #5:</b><br>Do you know...<br>You can find the file containing all your log and other information in the logbook.dat " description = tr("<b>Tip #5:</b><br>Do you know...<br>You can find the file containing all your log and other information in the logbook.dat "
"file and the klogrc file, containing the KLog config file in the KLog folder by opening the" "file and the klog.ini file, containing the KLog config file in the KLog folder by opening the"
" <a href=\"#FileOpenKLogFolder\">File->KLog folder</a> menu?"); " <a href=\"#FileOpenKLogFolder\">File->KLog folder</a> menu?");
break; break;
case 6: case 6:

8
src/utilities.cpp
View File

@ -23,8 +23,8 @@
* along with KLog. If not, see <https://www.gnu.org/licenses/>. * * along with KLog. If not, see <https://www.gnu.org/licenses/>. *
* * * *
*****************************************************************************/ *****************************************************************************/
#include "utilities.h" #include "utilities.h"
#include "klogconfig.h"
Utilities::Utilities() Utilities::Utilities()
{ {
@ -134,6 +134,7 @@ QString Utilities::boolToQString(const bool _b)
} }
} }
QString Utilities::checkAndFixASCIIinADIF(const QString &_data) QString Utilities::checkAndFixASCIIinADIF(const QString &_data)
{ {
//qDebug() << "SetupDialog::checkAndFixASCIIinADIF " << _data << Qt::endl; //qDebug() << "SetupDialog::checkAndFixASCIIinADIF " << _data << Qt::endl;
@ -159,6 +160,8 @@ QString Utilities::checkAndFixASCIIinADIF(const QString &_data)
return newString; return newString;
} }
#if 0
//not used
void Utilities::printQString(const QStringList &_qs) void Utilities::printQString(const QStringList &_qs)
{ {
//qDebug() << "Utilities::printQString: COMMENT THIS CALL BEFORE RELEASING" << Qt::endl; //qDebug() << "Utilities::printQString: COMMENT THIS CALL BEFORE RELEASING" << Qt::endl;
@ -174,6 +177,8 @@ void Utilities::printQString(const QStringList &_qs)
//qDebug() << _qs.at(_qs.length()-1) << Qt::endl; //qDebug() << _qs.at(_qs.length()-1) << Qt::endl;
} }
#endif
QString Utilities::getGlobalAgent(const QString &_klogversion) QString Utilities::getGlobalAgent(const QString &_klogversion)
{ {
return QString("KLog-%1").arg(_klogversion); return QString("KLog-%1").arg(_klogversion);
@ -259,7 +264,6 @@ QString Utilities::getAgent(const QString &_klogversion)
QString Utilities::getHomeDir() QString Utilities::getHomeDir()
{ {
//TODO: To be removed when the defaultDir is saved in the config file
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
//qDebug() << "WINDOWS DETECTED!: " << QDir::homePath() + "/klog" << Qt::endl; //qDebug() << "WINDOWS DETECTED!: " << QDir::homePath() + "/klog" << Qt::endl;
return QDir::homePath()+"/klog"; // We create the \klog for the logs and data return QDir::homePath()+"/klog"; // We create the \klog for the logs and data

4
src/utilities.h
View File

@ -65,8 +65,7 @@ public:
bool isDBFileExisting(const QString &_file); bool isDBFileExisting(const QString &_file);
QString getTQSLsFileName(); QString getTQSLsFileName();
QString getTQSLsPath(); // Depending on the OS where are usually installed the executables QString getTQSLsPath(); // Depending on the OS where are usually installed the executables
QString getHomeDir(); static QString getHomeDir();
QString getCfgFile();
QString getCTYFile(); QString getCTYFile();
QString getDebugLogFile(); QString getDebugLogFile();
QString getSaveSpotsLogFile(); QString getSaveSpotsLogFile();
@ -145,7 +144,6 @@ public:
QString getOnlineServiceName(OnLineProvider _service); QString getOnlineServiceName(OnLineProvider _service);
//QPalette getPalete(bool _ok); //QPalette getPalete(bool _ok);
private: private:
bool processConfigLine(const QString &_line);
QString getKLogDefaultDatabaseFile(); QString getKLogDefaultDatabaseFile();
int isAPrefix(const QString &_c); int isAPrefix(const QString &_c);
bool isValidSubCall(const QString &_c); bool isValidSubCall(const QString &_c);

6
tests/mainqsoentrywidget/mainqsoentrywidget.pro
View File

@ -16,7 +16,8 @@ HEADERS += \
../../src/qso.h \ ../../src/qso.h \
../../src/locator.h \ ../../src/locator.h \
../../src/klogdefinitions.h \ ../../src/klogdefinitions.h \
../../src/database.h ../../src/database.h \
../../src/klogconfig.h
SOURCES += tst_mainqsoentrywidget.cpp \ SOURCES += tst_mainqsoentrywidget.cpp \
../../src/mainqsoentrywidget.cpp \ ../../src/mainqsoentrywidget.cpp \
@ -24,7 +25,8 @@ SOURCES += tst_mainqsoentrywidget.cpp \
../../src/utilities.cpp \ ../../src/utilities.cpp \
../../src/qso.cpp \ ../../src/qso.cpp \
../../src/locator.cpp \ ../../src/locator.cpp \
../../src/database.cpp ../../src/database.cpp \
../../src/klogconfig.cpp

6
tests/mainwindowsattab/mainwindowsattab.pro
View File

@ -24,7 +24,8 @@ HEADERS += \
../../src/utilities.h \ ../../src/utilities.h \
../../src/locator.h \ ../../src/locator.h \
../../src/klogdefinitions.h \ ../../src/klogdefinitions.h \
../../src/database.h ../../src/database.h \
../../src/klogconfig.h
SOURCES += tst_mainwindowsattab.cpp \ SOURCES += tst_mainwindowsattab.cpp \
../../src/inputwidgets/mainwindowsattab.cpp \ ../../src/inputwidgets/mainwindowsattab.cpp \
@ -32,7 +33,8 @@ SOURCES += tst_mainwindowsattab.cpp \
../../src/qso.cpp \ ../../src/qso.cpp \
../../src/utilities.cpp \ ../../src/utilities.cpp \
../../src/locator.cpp \ ../../src/locator.cpp \
../../src/database.cpp ../../src/database.cpp \
../../src/klogconfig.cpp
isEmpty(QMAKE_LRELEASE) { isEmpty(QMAKE_LRELEASE) {

6
tests/tst_dataproxy/tst_dataproxy.pro
View File

@ -14,14 +14,16 @@ HEADERS += \
../../src/locator.h \ ../../src/locator.h \
../../src/database.h \ ../../src/database.h \
../../src/qso.h \ ../../src/qso.h \
../../src/klogdefinitions.h ../../src/klogdefinitions.h \
../../src/klogconfig.h \
SOURCES += tst_dataproxy.cpp \ SOURCES += tst_dataproxy.cpp \
../../src/utilities.cpp \ ../../src/utilities.cpp \
../../src/locator.cpp \ ../../src/locator.cpp \
../../src/database.cpp \ ../../src/database.cpp \
../../src/qso.cpp \ ../../src/qso.cpp \
../../src/dataproxy_sqlite.cpp ../../src/dataproxy_sqlite.cpp \
../../src/klogconfig.cpp

6
tests/tst_mainwindowinputqso/tst_mainwindowinputqso.pro
View File

@ -15,7 +15,8 @@ HEADERS += \
../../src/database.h \ ../../src/database.h \
../../src/qso.h \ ../../src/qso.h \
../../src/utilities.h \ ../../src/utilities.h \
../../src/locator.h ../../src/locator.h \
../../src/klogconfig.h
SOURCES += tst_mainwindowinputqso.cpp \ SOURCES += tst_mainwindowinputqso.cpp \
../../src/inputwidgets/mainwindowinputqso.cpp \ ../../src/inputwidgets/mainwindowinputqso.cpp \
@ -23,7 +24,8 @@ SOURCES += tst_mainwindowinputqso.cpp \
../../src/database.cpp \ ../../src/database.cpp \
../../src/qso.cpp \ ../../src/qso.cpp \
../../src/utilities.cpp \ ../../src/utilities.cpp \
../../src/locator.cpp ../../src/locator.cpp \
../../src/klogconfig.cpp
isEmpty(QMAKE_LRELEASE) { isEmpty(QMAKE_LRELEASE) {
win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe

6
tests/utilities/utilities.pro
View File

@ -12,11 +12,13 @@ QMAKE_CFLAGS += -Wall -Wextra -Werror
HEADERS += \ HEADERS += \
../../src/utilities.h \ ../../src/utilities.h \
../../src/locator.h ../../src/locator.h \
../../src/klogconfig.h
SOURCES += tst_utilities.cpp \ SOURCES += tst_utilities.cpp \
../../src/utilities.cpp \ ../../src/utilities.cpp \
../../src/locator.cpp ../../src/locator.cpp \
../../src/klogconfig.cpp

6
tests/world/world.pro
View File

@ -14,7 +14,8 @@ HEADERS += \
../../src/locator.h \ ../../src/locator.h \
../../src/utilities.h \ ../../src/utilities.h \
../../src/database.h \ ../../src/database.h \
../../src/qso.h ../../src/qso.h \
../../src/klogconfig.h
SOURCES += tst_world.cpp \ SOURCES += tst_world.cpp \
../../src/world.cpp \ ../../src/world.cpp \
@ -22,7 +23,8 @@ SOURCES += tst_world.cpp \
../../src/qso.cpp \ ../../src/qso.cpp \
../../src/utilities.cpp \ ../../src/utilities.cpp \
../../src/database.cpp \ ../../src/database.cpp \
../../src/locator.cpp ../../src/locator.cpp \
../../src/klogconfig.cpp