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

Bugfixes and Spanish translation

Browse Source
This commit is contained in:
jaime 2020-11-09 09:52:15 +00:00
parent 6191d2cc72
commit 2eb0a4d03a
22 changed files with 4018 additions and 4256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elogclublog.cpp
View File

@ -107,7 +107,7 @@ eLogClubLog::~eLogClubLog()
text = "ClubLog: " + tr("QSO dupe or not existing (#%1)... ").arg(result);
int i = QMessageBox::warning(nullptr, tr("KLog - ClubLog"),
tr("We have received an undefined error from Clublog (%1)").arg(result) + "\n" +
tr("This error may be caused for teh QSO being duplicated or, if removing, trying to remove a non existing QSO."),
tr("This error may be caused for the QSO being duplicated or, if removing, trying to remove a non existing QSO."),
QMessageBox::Ok);
}
else

145
hamlibclass.cpp
View File

@ -8,8 +8,9 @@
HamLibClass::HamLibClass(QObject *parent) : QObject(parent)
{
//qDebug() << "HamLibClass::HamLibClass" << endl;
qDebug() << "HamLibClass::HamLibClass" << endl;
strings.clear();
qDebug() << "HamLibClass::HamLibClass -10" << endl;
timer = new QTimer(this);
rigLaunched = false;
pollInterval = 300;
@ -17,17 +18,10 @@ HamLibClass::HamLibClass(QObject *parent) : QObject(parent)
readOnlyMode = false;
justEmitted = false;
//m_serial = new QSerialPort();
connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer()) );
//connect(m_serial, &QSerialPort::errorOccurred, this, &MainWindow::handleError);
//connect(m_serial, &QSerialPort::readyRead, this, &MainWindow::readData);
//timer->start(1000);
qDebug() << "HamLibClass::HamLibClass -20" << endl;
clean();
//qDebug() << "HamLibClass::HamLibClass END" << endl;
qDebug() << "HamLibClass::HamLibClass END" << endl;
}
HamLibClass::~HamLibClass()
@ -48,14 +42,13 @@ void HamLibClass::setPoll(const int _milsecs)
}
}
void HamLibClass::readRadio()
void HamLibClass::readRadio(bool _forceRead)
{
slotTimer();
readRadioInternal(_forceRead);
}
void HamLibClass::slotTimer()
void HamLibClass::readRadioInternal(bool _forceRead)
{
//freq_old = freq;
if (!isRunning())
{
return;
@ -66,22 +59,21 @@ void HamLibClass::slotTimer()
if (retcode == RIG_OK)
{
errorCount = 0;
//qDebug() << "HamLibClass::slotTimer: Freq: " << QString::number(freq) << endl;
if ((freq_old > freq) || (freq_old < freq))
//if (freq_old != freq)
//qDebug() << "HamLibClass:readRadioInternal: Freq: " << QString::number(freq) << endl;
if ((freq_old > freq) || (freq_old < freq) || (_forceRead == true))
{
emit freqChanged(freq/1000000);
freq_old = freq;
//qDebug() << "HamLibClass::slotTimer EMITING; " << QString::number(freq) << endl;
qDebug() << "HamLibClass::readRadioInternal EMITING; " << QString::number(freq) << endl;
}
//qDebug() << "HamLibClass::slotTimer read: " << QString::number(freq) << endl;
//qDebug() << "HamLibClass::readRadioInternal read: " << QString::number(freq) << endl;
}
else
{
//qDebug() << "HamLibClass::slotTimer Unable to read FREQ - Error: " << QString::number(retcode) << endl;
//qDebug() << "HamLibClass::slotTimer Unable to read FREQ - Error: " << rigerror(retcode) << endl;
//qDebug() << "HamLibClass::readRadioInternal Unable to read FREQ - Error: " << QString::number(retcode) << endl;
//qDebug() << "HamLibClass::readRadioInternal Unable to read FREQ - Error: " << rigerror(retcode) << endl;
stop();
}
@ -90,7 +82,7 @@ void HamLibClass::slotTimer()
{
errorCount = 0;
//qDebug() << "HamLibClass::slotTimer: Mode: " << hamlibMode2Mode(rmode) << endl;
if (mode_old != rmode)
if ((mode_old != rmode) || (_forceRead == true))
{
if (justEmitted)
{
@ -106,7 +98,16 @@ void HamLibClass::slotTimer()
{
stop();
}
//checkErrorCountAndStop();
}
void HamLibClass::slotTimer()
{
//freq_old = freq;
if (!isRunning())
{
return;
}
readRadioInternal(false); // We don't force the radio reading.
}
@ -347,101 +348,98 @@ void HamLibClass::stop()
void HamLibClass::clean()
{
//qDebug() << "HamLibClass::Clean" << endl;
qDebug() << "HamLibClass::Clean" << endl;
myrig_model = 1; //Dummy equipment
//qDebug() << "HamLibClass::Clean 0" << endl;
//myport.parm.serial.rate = 57600;
qDebug() << "HamLibClass::Clean 0" << endl;
bauds = 9600;
//qDebug() << "HamLibClass::Clean - 1" << endl;
dataBits = 8;
//qDebug() << "HamLibClass::Clean - 2" << endl;
stopBits = 1;
//qDebug() << "HamLibClass::Clean - 3" << endl;
qDebug() << "HamLibClass::Clean - 3" << endl;
shandshake = RIG_HANDSHAKE_NONE;
//qDebug() << "HamLibClass::Clean - 4" << endl;
qDebug() << "HamLibClass::Clean - 4" << endl;
sparity = RIG_PARITY_NONE;
//qDebug() << "HamLibClass::Clean - 5" << endl;
//myport.type.rig = RIG_PORT_SERIAL;
qDebug() << "HamLibClass::Clean - 5" << endl;
//qDebug() << "HamLibClass::Clean - 8" << endl;
serialPort = QString();
sdtr = RIG_SIGNAL_UNSET;
//qDebug() << "HamLibClass::Clean - 9" << endl;
qDebug() << "HamLibClass::Clean - 9" << endl;
srts = RIG_SIGNAL_UNSET;
//qDebug() << "HamLibClass::Clean - 10" << endl;
qDebug() << "HamLibClass::Clean - 10" << endl;
rigLaunched = false;
//qDebug() << "HamLibClass::clean - END" << endl;
qDebug() << "HamLibClass::clean - END" << endl;
}
void HamLibClass::init(bool _active)
{
//qDebug()<< "HamLibClass::init: " << endl;
qDebug()<< "HamLibClass::init: " << endl;
//qDebug() << "HamLibClass::init: " << getNameFromModelId(myrig_model) << endl;
//qDebug() << "HamLibClass::init: " << getNameFromModelId(myrig_model) << endl;
if (!_active)
{
//qDebug()<< "HamLibClass::init: Stopping..." << endl;
qDebug()<< "HamLibClass::init: Stopping..." << endl;
stop();
//qDebug() << "HamLibClass::init: Stopped!" << endl;
qDebug() << "HamLibClass::init: Stopped!" << endl;
return;
}
if (myrig_model == -1)
{
//qDebug()<< "HamLibClass::init: Rig Model not valid" << endl;
qDebug()<< "HamLibClass::init: Rig Model not valid" << endl;
return;
}
rig_set_debug(RIG_DEBUG_NONE);
qDebug()<< "HamLibClass::init: set Debug NONE" << endl;
my_rig = rig_init(myrig_model);
qDebug()<< "HamLibClass::init: set after init" << endl;
if (my_rig == nullptr)
{
//qDebug()<< "HamLibClass::init: Init failed, hamlib returned fail!" << endl;
qDebug()<< "HamLibClass::init: Init failed, hamlib returned fail!" << endl;
return;
}
else
{
//qDebug() << "HamLibClass::init: rig_init went OK!" << endl;
qDebug() << "HamLibClass::init: rig_init went OK!" << endl;
}
my_rig->state.rigport.type.rig = RIG_PORT_SERIAL;
//serialPort = "/dev/cu.usbserial";
//qDebug() << "HamLibClass::init: serialport: " << serialPort << endl;
//qDebug() << "HamLibClass::init: serialport2: " << serialPort.toLocal8Bit() << endl;
qDebug() << "HamLibClass::init: serialport2: " << serialPort.toLocal8Bit() << endl;
strncpy (my_rig->state.rigport.pathname, serialPort.toLocal8Bit().constData(), FILPATHLEN);
//qDebug() << "HamLibClass::init: rigport: " << my_rig->state.rigport.pathname << endl;
my_rig->state.rigport.parm.serial.rate = bauds;
//qDebug() << "HamLibClass::init: serial rate: " << QString::number(my_rig->state.rigport.parm.serial.rate) << endl;
qDebug() << "HamLibClass::init: serial rate: " << QString::number(my_rig->state.rigport.parm.serial.rate) << endl;
my_rig->state.rigport.parm.serial.data_bits = dataBits;
//qDebug() << "HamLibClass::init: data bits: " << QString::number(my_rig->state.rigport.parm.serial.data_bits) << endl;
qDebug() << "HamLibClass::init: data bits: " << QString::number(my_rig->state.rigport.parm.serial.data_bits) << endl;
my_rig->state.rigport.parm.serial.stop_bits = stopBits;
//qDebug() << "HamLibClass::init: stop bits: " << QString::number(my_rig->state.rigport.parm.serial.stop_bits) << endl;
qDebug() << "HamLibClass::init: stop bits: " << QString::number(my_rig->state.rigport.parm.serial.stop_bits) << endl;
my_rig->state.rigport.parm.serial.parity = sparity;
//my_rig->state.rigport.parm.serial.dtr_state = RIG_SIGNAL_ON;
//my_rig->state.rigport.parm.serial.rts_state = RIG_SIGNAL_ON;
//qDebug() << "HamLibClass::init: handshake before" << endl;
qDebug() << "HamLibClass::init: handshake before" << endl;
my_rig->state.rigport.parm.serial.handshake = shandshake;
//qDebug() << "HamLibClass::init: handshake after" << endl;
qDebug() << "HamLibClass::init: after handshake " << endl;
// Config done
retcode = rig_open(my_rig);
//qDebug() << "HamLibClass::init: retcode" << endl;
qDebug() << "HamLibClass::init: retcode" << endl;
if (retcode != RIG_OK)
{
//qDebug()<< "HamLibClass::init: Can't open: " << rigerror(retcode) << endl;
qDebug()<< "HamLibClass::init: Can't open: " << rigerror(retcode) << endl;
errorCount++;
rig_cleanup(my_rig);
return ;
}
//qDebug()<< "HamLibClass::init: Rig open!" << endl;
qDebug()<< "HamLibClass::init: Rig open!" << endl;
errorCount = 0;
rigLaunched = true;
timer->start(pollInterval);
//qDebug() << "HamLibClass::init: END TRUE" << endl;
qDebug() << "HamLibClass::init: END TRUE" << endl;
return;
}
@ -454,39 +452,40 @@ bool HamLibClass::isRunning()
QStringList HamLibClass::getRigList ()
{
//qDebug() << "HamLibClass::getRigList" << endl;
qDebug() << "HamLibClass::getRigList" << endl;
// Rutine to fill the rig combo boxes
// Do not display debug codes when load the rig's
rig_set_debug (RIG_DEBUG_NONE);
qDebug() << "HamLibClass::getRigList-01" << endl;
// and continue...
strings.clear();
qDebug() << "HamLibClass::getRigList-02" << endl;
rig_load_all_backends();
//qDebug() << "HamLibClass::getRigList-10" << endl;
qDebug() << "HamLibClass::getRigList-10" << endl;
rig_list_foreach (addRigToList, this);
//qDebug() << "HamLibClass::getRigList-11" << endl;
strings.sort();
//qDebug() << "HamLibClass::getRigList-12" << endl;
qDebug() << "HamLibClass::getRigList-12" << endl;
return strings;
}
int HamLibClass::addRigToList (const struct rig_caps *caps, void *data)
{
//qDebug() << "HamLibClass::addRigToList" << caps->model_name << endl;
qDebug() << "HamLibClass::addRigToList" << caps->model_name << endl;
QString name;
//qDebug() << "HamLibClass::addRigToList-10" << endl;
qDebug() << "HamLibClass::addRigToList-10" << endl;
HamLibClass *r = (HamLibClass *) data;
//qDebug() << "HamLibClass::addRigToList-11" << endl;
qDebug() << "HamLibClass::addRigToList-11" << endl;
name = caps->model_name;
//qDebug() << "HamLibClass::addRigToList-12" << endl;
qDebug() << "HamLibClass::addRigToList-12" << endl;
r->rigName2RigId[name] = caps->rig_model; // We fill the equivalences between name & Id
//qDebug() << "HamLibClass::addRigToList-13" << endl;
qDebug() << "HamLibClass::addRigToList-13" << endl;
r->rigId2RigName[caps->rig_model] = name;
//qDebug() << "HamLibClass::addRigToList-14" << endl;
qDebug() << "HamLibClass::addRigToList-14" << endl;
r->strings << name;
//qDebug() << "HamLibClass::addRigToList-END" << endl;
qDebug() << "HamLibClass::addRigToList-END" << endl;
return -1; // not 0 --> we want all rigs
}
@ -500,20 +499,20 @@ int HamLibClass::getModelIdFromName (const QString &_name)
QString HamLibClass::getNameFromModelId(const int _id)
{
//qDebug() << "HamLibClass::getNameFromModelId: " << QString::number(_id) << "/" << rigId2RigName.value(_id)<< endl;
qDebug() << "HamLibClass::getNameFromModelId: " << QString::number(_id) << "/" << rigId2RigName.value(_id)<< endl;
return rigId2RigName.value(_id);
}
void HamLibClass::setModelId(const int _id)
{
//qDebug() << "HamLibClass::setModelId: " << QString::number(_id) << endl;
qDebug() << "HamLibClass::setModelId: " << QString::number(_id) << endl;
myrig_model = _id;
}
void HamLibClass::setPort(const QString &_port)
{
//qDebug() << "HamLibClass::setPort: " << _port << endl;
qDebug() << "HamLibClass::setPort: " << _port << endl;
serialPort = _port;
//strncpy (my_rig->state.rigport.pathname, serialPort.toLocal8Bit().constData(), FILPATHLEN);
//qstrncpy(myport.pathname, serialPort.toLocal8Bit().constData(), serialPort.length()+1);
@ -580,7 +579,7 @@ void HamLibClass::setParity(const QString &_parity)
void HamLibClass::setFreq(const double _fr)
{
//qDebug() << "HamLibClass::setFreq: " << QString::number(_fr) << endl;
qDebug() << "HamLibClass::setFreq: " << QString::number(_fr) << endl;
if ((!isRunning()) || (readOnlyMode))
{
return;
@ -590,7 +589,7 @@ void HamLibClass::setFreq(const double _fr)
int retcode = rig_set_freq(my_rig, RIG_VFO_CURR, freq);
if (retcode != RIG_OK)
{
//qDebug() << "HamLibClass::setFreq NOK: " << endl;
qDebug() << "HamLibClass::setFreq NOK: " << endl;
stop();
errorCount++;
@ -599,18 +598,18 @@ void HamLibClass::setFreq(const double _fr)
else
{
errorCount = 0;
//qDebug() << "HamLibClass::setFreq OK: " << QString::number(freq) << endl;
qDebug() << "HamLibClass::setFreq OK: " << QString::number(freq) << endl;
retcode = rig_get_freq(my_rig, RIG_VFO_CURR, &freq);
if (retcode == RIG_OK)
{
errorCount = 0;
//qDebug() << "HamLibClass::setFreq read: " << QString::number(freq) << endl;
qDebug() << "HamLibClass::setFreq read: " << QString::number(freq) << endl;
}
else
{
stop();
errorCount++;
//qDebug() << "HamLibClass::setFreq Unable to read FREQ" << endl;
qDebug() << "HamLibClass::setFreq Unable to read FREQ" << endl;
}
return;
}

3
hamlibclass.h
View File

@ -44,7 +44,7 @@ public:
void init(bool _active);
void stop();
void readRadio();
void readRadio(bool _forceRead);
bool isRunning();
void clean();
void checkErrorCountAndStop();
@ -61,6 +61,7 @@ public slots:
void slotTimer();
private:
void readRadioInternal(bool _forceRead);
static int addRigToList(const struct rig_caps* caps, void* data);
QString hamlibMode2Mode(rmode_t _rmode);
rmode_t mode2HamlibMode(const QString &_m);

2
main.cpp
View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
//qDebug() << "KLog Main: Start! " << endl;
//qDebug() << "KLog Main: " << QSslSocket::supportsSsl() << QSslSocket::sslLibraryBuildVersionString() << QSslSocket::sslLibraryVersionString() << endl;
QDir d1 = QDir();
QString version = "1.4-RC7";
QString version = "1.4-RC6b";
Utilities util = Utilities();
QStringList arguments;
QTextStream cout(stdout);

137
mainwindow.cpp
View File

@ -38,7 +38,7 @@
MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
{
//qDebug() << "MainWindow::MainWindow: "<< _klogDir << " Ver: " << tversion << endl;
qDebug() << "MainWindow::MainWindow: "<< _klogDir << " Ver: " << tversion << endl;
//qDebug() << "MainWindow::MainWindow: Con func: "<< Q_FUNC_INFO << endl;
softwareVersion = tversion;
@ -53,7 +53,7 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
QRZCOMAutoCheckAct->setCheckable(true);
QRZCOMAutoCheckAct->setChecked(false);
QString debugName = util->getDebugLogFile();
//qDebug() << "MainWindow::MainWindow: Debug File: "<< debugName << endl;
qDebug() << "MainWindow::MainWindow: Debug File: "<< debugName << endl;
debugFile = new QFile(debugName);
@ -76,15 +76,15 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
//QTime start;
//start = QTime::currentTime();
//qDebug() << "MainWindow::MainWindow: "<< (QTime::currentTime()).toString("hhmmsszzz")<< endl;
qDebug() << "MainWindow::MainWindow: "<< (QTime::currentTime()).toString("hhmmsszzz")<< endl;
showErrorDialog = new ShowErrorDialog();
UDPLogServer = new UDPServer();
//qDebug() << "MainWindow::MainWindow: BEFORE HAMLIB " << endl;
qDebug() << "MainWindow::MainWindow: BEFORE HAMLIB " << endl;
hamlib = new HamLibClass();
//pstRotator = new PSTRotatorSupport(this);
//rotatorWidget = new RotatorWidget;
//qDebug() << "MainWindow::MainWindow: AFTER HAMLIB " << endl;
qDebug() << "MainWindow::MainWindow: AFTER HAMLIB " << endl;
dataProxy = new DataProxy_SQLite(softwareVersion, Q_FUNC_INFO);
@ -92,39 +92,39 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
eqslUtilities = new eQSLUtilities(Q_FUNC_INFO);
//qDebug() << "MainWindow::MainWindow: Before DXCCStatusWidget " << endl;
qDebug() << "MainWindow::MainWindow: Before DXCCStatusWidget " << endl;
dxccStatusWidget = new DXCCStatusWidget(dataProxy, Q_FUNC_INFO);
//qDebug() << "MainWindow::MainWindow: After DXCCStatusWidget " << endl;
//qDebug() << "MainWindow::MainWindow: 00081" << endl;
qDebug() << "MainWindow::MainWindow: After DXCCStatusWidget " << endl;
qDebug() << "MainWindow::MainWindow: 00081" << endl;
elogClublog = new eLogClubLog();
//qDebug() << "MainWindow::MainWindow: 00082" << endl;
qDebug() << "MainWindow::MainWindow: 00082" << endl;
elogQRZcom = new eLogQrzLog(dataProxy, Q_FUNC_INFO);
//qDebug() << "MainWindow::MainWindow: 00083" << endl;
qDebug() << "MainWindow::MainWindow: 00083" << endl;
updateSatsData = new UpdateSatsData(dataProxy);
//qDebug() << "MainWindow::MainWindow: 00084" << endl;
qDebug() << "MainWindow::MainWindow: 00084" << endl;
statsWidget = new StatisticsWidget(dataProxy);
//qDebug() << "MainWindow::MainWindow: 00085" << endl;
qDebug() << "MainWindow::MainWindow: 00085" << endl;
//statsWidget->show();
infoLabel1 = new QLabel(tr("Status bar ..."));
infoLabel2 = new QLabel(tr("DX Entity"));
//qDebug() << "MainWindow::MainWindow: 00086" << endl;
qDebug() << "MainWindow::MainWindow: 00086" << endl;
logWindow = new LogWindow(dataProxy, this);
//qDebug() << "MainWindow::MainWindow: 00087" << endl;
qDebug() << "MainWindow::MainWindow: 00087" << endl;
searchWidget = new SearchWidget (dataProxy, this);
//qDebug() << "MainWindow::MainWindow: 00087.1" << endl;
qDebug() << "MainWindow::MainWindow: 00087.1" << endl;
infoWidget = new InfoWidget(dataProxy, this);
//qDebug() << "MainWindow::MainWindow: 00088" << endl;
qDebug() << "MainWindow::MainWindow: 00088" << endl;
logEvent(Q_FUNC_INFO, "Creating AwardsWidget", 7);
awardsWidget = new AwardsWidget(dataProxy, this);
//qDebug() << "MainWindow::MainWindow: 0009" << endl;
qDebug() << "MainWindow::MainWindow: 0009" << endl;
aboutDialog = new AboutDialog(softwareVersion);
tipsDialog = new TipsDialog();
@ -132,7 +132,6 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
configFileName = util->getCfgFile();
ctyDatFile = util->getCTYFile();
//downloadcty = new DownLoadCTY(klogDir, softwareVersion, Q_FUNC_INFO);
downloadcty = new DownLoadCTY(klogDir, softwareVersion);
statusBarMessage = tr("Starting KLog");
@ -145,13 +144,13 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
}
}
//qDebug() << "MainWindow::MainWindow: 4" << endl;
qDebug() << "MainWindow::MainWindow: 4" << endl;
world = new World(dataProxy, klogDir, softwareVersion, Q_FUNC_INFO);
//qDebug() << "MainWindow::MainWindow: xx" << endl;
qDebug() << "MainWindow::MainWindow: xx" << endl;
setupDialog = new SetupDialog(dataProxy, configFileName, softwareVersion, 0, !configured);
//qDebug() << "MainWindow::MainWindow: satTabWidget to be created" << endl;
qDebug() << "MainWindow::MainWindow: satTabWidget to be created" << endl;
satTabWidget = new MainWindowSatTab(dataProxy);
myDataTabWidget = new MainWindowMyDataTab();
@ -160,18 +159,16 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
eQSLTabWidget = new MainWindowInputEQSL(dataProxy);
QSLTabWidget = new MainWindowInputQSL(dataProxy);
mainQSOEntryWidget = new MainQSOEntryWidget(dataProxy);
//qDebug() << "MainWindow::MainWindow: locator to be created" << endl;
qDebug() << "MainWindow::MainWindow: locator to be created" << endl;
locator = new Locator();
mainWidget = new QWidget(this);
setCentralWidget(mainWidget);
//qDebug() << "MainWindow::MainWindow: 8" << endl;
qDebug() << "MainWindow::MainWindow: 8" << endl;
dateTime = new QDateTime();
dateTimeTemp = new QDateTime();
// timer = new QTimer(this);
//qrzLineEdit = new QLineEdit;
nameLineEdit = new QLineEdit;
qthLineEdit = new QLineEdit;
locatorLineEdit = new QLineEdit;
@ -189,11 +186,11 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
rxFreqSpinBox = new QDoubleSpinBox;
rxPowerSpinBox = new QDoubleSpinBox;
//qDebug() << "MainWindow::MainWindow: dxclusterwidget to be created" << endl;
qDebug() << "MainWindow::MainWindow: dxclusterwidget to be created" << endl;
dxClusterWidget = new DXClusterWidget(dataProxy, dxclusterServerToConnect , dxclusterServerPort, this);
//qDebug() << "MainWindow::MainWindow: Awards to be created" << endl;
qDebug() << "MainWindow::MainWindow: Awards to be created" << endl;
awards = new Awards(dataProxy, Q_FUNC_INFO);
//qDebug() << "MainWindow::MainWindow: Awards created" << endl;
qDebug() << "MainWindow::MainWindow: Awards created" << endl;
// </UI>
@ -202,17 +199,21 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
exit(0);
}
//qDebug() << "MainWindow::MainWindow: UI to be created" << endl;
qDebug() << "MainWindow::MainWindow: UI to be created" << endl;
//qDebug() << "MainWindow::MainWindow: Software update to be created" << endl;
qDebug() << "MainWindow::MainWindow: Software update to be created" << endl;
softUpdate = new SoftwareUpdate(softwareVersion);
qDebug() << "MainWindow::MainWindow: FileManager to be created" << endl;
filemanager = new FileManager(dataProxy, klogDir, softwareVersion);
qDebug() << "MainWindow::MainWindow: FileAwardManager to be created" << endl;
fileAwardManager = new FileAwardManager(dataProxy, Q_FUNC_INFO);
lotwCallTQSL = new QAction(tr("Upload to LoTW"), this);
qDebug() << "MainWindow::MainWindow: AdifLoTWExportWidget to be created" << endl;
adifLoTWExportWidget = new AdifLoTWExportWidget(dataProxy, Q_FUNC_INFO);
qDebug() << "MainWindow::MainWindow: ShowAdifImportWidget to be created" << endl;
showAdifImportWidget = new ShowAdifImportWidget(dataProxy, Q_FUNC_INFO);
@ -220,7 +221,7 @@ MainWindow::MainWindow(const QString &_klogDir, const QString &tversion)
logEvent(Q_FUNC_INFO, "END", logSeverity);
//qDebug() << "MainWindow::MainWindow: END" << endl;
qDebug() << "MainWindow::MainWindow: END" << endl;
}
void MainWindow::saveWindowsSize()
@ -454,7 +455,7 @@ void MainWindow::init()
//lotwTQSLpath = util->getTQSLsPath() + util->getTQSLsFileName();
upAndRunning = true;
mainQSOEntryWidget->setUpAndRunning(upAndRunning);
hamlib->readRadio();
hamlib->readRadio(true); // Forcing the radio update
//qDebug() << "MainWindow::init: END" << endl;
}
@ -3008,9 +3009,7 @@ void MainWindow::slotExitFromSlotDialog(const int exitID)
if (exitID == 2)
{
needToEnd = true;
exitQuestion();
}
//qDebug()() << "MainWindow::slotExitFromSlotDialog: END " << endl;
@ -4297,6 +4296,10 @@ void MainWindow::openSetup(const int _page)
dataProxy->reconnectDB();
logEvent(Q_FUNC_INFO, "after db->reConnect", logSeverity);
//qDebug() << "MainWindow::MainWindow: after db->reConnect" << endl;
if (hamlibActive)
{
qDebug() << "MainWindow::MainWindow: Hamlib is active, let's read the VFO Freq/Mode" << endl;
}
logEvent(Q_FUNC_INFO, "END", logSeverity);
}
@ -4976,14 +4979,7 @@ bool MainWindow::processConfigLine(const QString &_line){
else if (field=="UDPSERVER")
{
//qDebug() << "MainWindow::processConfigLine: UDPSERVER: " << value.toUpper() << endl;
if (value.toUpper() == "TRUE")
{
UDPServerStart = true;
}
else
{
UDPServerStart = false;
}
UDPServerStart = util->trueOrFalse(value);
}
else if (field=="UDPSERVERPORT")
{
@ -4999,27 +4995,12 @@ bool MainWindow::processConfigLine(const QString &_line){
}
else if (field=="LOGFROMWSJTX")
{
if (value.toUpper() == "TRUE")
{
UDPLogServer->setLogging(true);
}
else
{
UDPLogServer->setLogging(false);
}
UDPLogServer->setLogging(util->trueOrFalse(value));
}
else if (field=="LOGAUTOFROMWSJTX")
{
if (value.toUpper() == "TRUE")
{
wsjtxAutoLog = true;
//UDPLogServer->setLogging(true);
}
else
{
wsjtxAutoLog = false;
//UDPLogServer->setLogging(false);
}
wsjtxAutoLog = util->trueOrFalse(value);
}
else if (field == "HAMLIBRIGTYPE" )
{
@ -5066,40 +5047,19 @@ bool MainWindow::processConfigLine(const QString &_line){
hamlib->setPoll(value.toInt());
}else if (field == "HAMLIB")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIB: " << value << endl;
if (value.toUpper() == "TRUE")
{
hamlibActive = true;
}
else
{
hamlibActive = false;
}
//qDebug() << "MainWindow::processConfigLine: HAMLIB: " << value << endl;
qDebug() << "MainWindow::processConfigLine: HAMLIB: " << value << endl;
hamlibActive = util->trueOrFalse(value);
qDebug() << "MainWindow::processConfigLine: HAMLIB: " << value << endl;
}
else if (field == "HAMLIBREADONLY")
{
//qDebug() << "MainWindow::processConfigLine: HAMLIBREADONLY: " << value << endl;
if (value.toUpper() == "TRUE")
{
hamlib->setReadOnly(true);
}
else
{
hamlib->setReadOnly(false);
}
hamlib->setReadOnly(util->trueOrFalse(value));
}
else if (field=="REALTIMEFROMWSJTX")
{
//qDebug() << "MainWindow::processConfigLine: REALTIMEFROMWSJTX: " << value << endl;
if (value.toUpper() == "TRUE")
{
UDPLogServer->setRealTimeUpdate(true);
}
else
{
UDPLogServer->setRealTimeUpdate(false);
}
UDPLogServer->setRealTimeUpdate(util->trueOrFalse(value));
}
else if(field=="SELECTEDLOG")
{
@ -7515,10 +7475,7 @@ void MainWindow::clusterSpotToLog(const QString &_call, const QString &_freq)
//bandComboBox->setCurrentIndex(bandComboBox->findText(dataProxy->getNameFromBandId(defaultBand), Qt::MatchCaseSensitive));
//bandComboBox->setCurrentIndex(defaultBand);
}
if (hamlibActive)
{
//hamlib->readRadio();
}
logEvent(Q_FUNC_INFO, "END", logSeverity);
}

13
setupdialog.cpp
View File

@ -608,7 +608,8 @@ void SetupDialog::slotOkButtonClicked()
//stream << "PSTRotatorPort=" << interfacesWindowsPage->getPSTRotatorUDPServerPort() << ";" << endl;
//qDebug() << "SetupDialog::slotOkButtonClicked - 30" << endl;
if ((miscPage->getReportInfo()).toUpper() == "TRUE")
if ( util->trueOrFalse((miscPage->getReportInfo()).toUpper()))
{
stream << "ProvideInfo=True;" << endl;
}
@ -650,7 +651,9 @@ void SetupDialog::slotOkButtonClicked()
//qDebug() << "SetupDialog::slotOkButtonClicked SelectedLog: " << logsPage->getSelectedLog() << endl;
// CLUBLOG
//qDebug() << "SetupDialog::slotOkButtonClicked - 40" << endl;
if ((( (eLogPage->getClubLogActive())).toUpper() == "TRUE" ) && (eLogPage->getClubLogEmail().length()>2) )
if ( (util->trueOrFalse(eLogPage->getClubLogActive())) && (eLogPage->getClubLogEmail().length()>2) )
//if ((( util->trueOrFalse((eLogPage->getClubLogActive()))) ) && (eLogPage->getClubLogEmail().length()>2) )
{ //TODO: Add a isValidEmail funcion in the clubLogPage
tmp = eLogPage->getClubLogActive();
if (tmp.length()>0)
@ -678,7 +681,8 @@ void SetupDialog::slotOkButtonClicked()
}
//qDebug() << "SetupDialog::slotOkButtonClicked - 50" << endl;
// eQSL
if (((eLogPage->getEQSLActive()).toUpper() == "TRUE" ) && (eLogPage->getEQSLEmail().length()>0) )
if (( util->trueOrFalse((eLogPage->getEQSLActive()).toUpper())) && (eLogPage->getEQSLEmail().length()>0) )
{
tmp = eLogPage->getEQSLActive();
if (tmp.length()>0)
@ -708,7 +712,8 @@ void SetupDialog::slotOkButtonClicked()
// eQSL - END
// QRZ.com
if (((eLogPage->getQRZCOMActive()).toUpper() == "TRUE" ) && (eLogPage->getQRZCOMUser().length()>0) )
if (( util->trueOrFalse((eLogPage->getEQSLActive()).toUpper()) ) && (eLogPage->getQRZCOMUser().length()>0) )
{
tmp = eLogPage->getQRZCOMActive();
if (tmp.length()>0)

28
setuppages/setuppageelog.cpp
View File

@ -47,6 +47,10 @@ SetupPageELog::SetupPageELog(QWidget *parent) : QWidget(parent)
clubLogEmailLineEdit->setToolTip(tr("Enter the email you used to register in ClubLog."));
clubLogPasswordLineEdit->setToolTip(tr("Enter your password ClubLog here. Warning: The password will be save on clear in the KLog config file!! (If you don't want to enter the password, KLog will ask you when it is needed.)"));
QRegularExpression rx("\\b[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}\\b",
QRegularExpression::CaseInsensitiveOption);
clubLogEmailLineEdit->setValidator(new QRegularExpressionValidator(rx, this));
clubLogSendInRealTimeCheckBox = new QCheckBox(tr("Send QSOs in real time"), this);
clubLogActiveCheckBox = new QCheckBox(tr("Activate ClubLog"), this);
clubLogSendInRealTimeCheckBox->setToolTip(tr("Send each QSO to ClubLog in real time, as they are added (or modified) in KLog."));
@ -129,6 +133,8 @@ SetupPageELog::SetupPageELog(QWidget *parent) : QWidget(parent)
lotwDownGroup = new QGroupBox (tr("Download"));
lotwUserLineEdit = new QLineEdit;
lotwUserLineEdit->setValidator(new QRegularExpressionValidator(rx, this));
lotwPasswordLineEdit = new QLineEdit;
lotwPasswordLineEdit->setEchoMode(QLineEdit::PasswordEchoOnEdit);
lotwTQSLPathLineEdit = new QLineEdit;
@ -199,6 +205,10 @@ SetupPageELog::SetupPageELog(QWidget *parent) : QWidget(parent)
connect(lotwSearchTQSLPushButton, SIGNAL(clicked()), this, SLOT(slotSelectTQSLClicked()) );
connect(lotwTQSLPathLineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotPathLineEditChanged(QString)) );
connect(lotwUseTQSLCheckBox, SIGNAL(toggled(bool) ), this, SLOT(slotTQSLActive(bool)));
connect(clubLogEmailLineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotClubLogEmailDefineColor() ) );
connect(lotwUserLineEdit, SIGNAL(textChanged(QString)), this, SLOT(slotLoTWEmailDefineColor() ) );
//qDebug() << "SetupPageELog::SetupPageELog - 00150" << endl;
setDefaults();
slotClubLogActive(false);
@ -214,6 +224,24 @@ SetupPageELog::~SetupPageELog()
{
}
void SetupPageELog::slotClubLogEmailDefineColor()
{
qDebug() << "SetupPageELog::slotCLubLogEmailDefineColor" << endl;
if(!clubLogEmailLineEdit->hasAcceptableInput())
clubLogEmailLineEdit->setStyleSheet("QLineEdit { color: red;}");
else
clubLogEmailLineEdit->setStyleSheet("QLineEdit { color: black;}");
}
void SetupPageELog::slotLoTWEmailDefineColor()
{
qDebug() << "SetupPageELog::slotLoTWEmailDefineColor" << endl;
if(!lotwUserLineEdit->hasAcceptableInput())
lotwUserLineEdit->setStyleSheet("QLineEdit { color: red;}");
else
lotwUserLineEdit->setStyleSheet("QLineEdit { color: black;}");
}
void SetupPageELog::setDefaults()
{
qrzcomActive = false;

3
setuppages/setuppageelog.h
View File

@ -97,7 +97,8 @@ private slots:
void slotSelectTQSLClicked();
void slotPathLineEditChanged(const QString _q);
void slotEnterKeyPressed();
void slotClubLogEmailDefineColor();
void slotLoTWEmailDefineColor();
signals:
void enterKey();
void qrzcomAuto(bool _s);

1
setuppages/setuppagehamlib.cpp
View File

@ -382,6 +382,7 @@ bool SetupPageHamLib::setSerialSpeed(const QString &_speed )
void SetupPageHamLib::setActive(const QString &_active)
{
//qDebug() << "SetupPageHamLib::setActive: " << _active << endl;
if (_active.toUpper() == "TRUE")
{
activateHamlibCheckBox->setChecked(true);

305
setuppages/setuppagemisc.cpp
View File

@ -190,130 +190,46 @@ void SetupPageMisc::createActions(){
//connect(UDPServerCheckBox, SIGNAL(clicked () ), this, SLOT(slotUDPServerCheckBoxClicked() ) );
}
/*
QString SetupPageMisc::getLogSort(){
if (logSortCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
}
void SetupPageMisc::setLogSort(const QString &_t){
if ( (_t.toUpper()) == "FALSE")
{
logSortCheckBox->setChecked(false);
}
else
{
logSortCheckBox->setChecked(true);
}
}
*/
QString SetupPageMisc::getSendEQSLByDefault(){
if (sendEQSLByDefaultSearchCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(sendEQSLByDefaultSearchCheckBox->isChecked());
}
void SetupPageMisc::setSetEQSLByDefault(const QString &_t){
if ( (_t.toUpper()) == "FALSE")
{
sendEQSLByDefaultSearchCheckBox->setChecked(false);
}
else
{
sendEQSLByDefaultSearchCheckBox->setChecked(true);
}
sendEQSLByDefaultSearchCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getRealTime(){
if (realTimeCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(realTimeCheckbox->isChecked());
}
void SetupPageMisc::setRealTime(const QString &_t)
{
//QString st = t;
if ( (_t.toUpper()) == "FALSE")
{
realTimeCheckbox->setChecked(false);
}
else
{
realTimeCheckbox->setChecked(true);
}
realTimeCheckbox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getUTCTime(){
if (UTCCheckbox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(UTCCheckbox->isChecked());
}
void SetupPageMisc::setUTCTime(const QString &_t){
if ( (_t.toUpper()) == "FALSE")
{
UTCCheckbox->setChecked(false);
}
else
{
UTCCheckbox->setChecked(true);
}
void SetupPageMisc::setUTCTime(const QString &_t)
{
UTCCheckbox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getAlwaysADIF()
{
if (alwaysADIFCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(alwaysADIFCheckBox->isChecked());
}
void SetupPageMisc::setAlwaysADIF(const QString &_t)
{ // Defaul value is false
if ( (_t.toUpper()) == "TRUE")
{
alwaysADIFCheckBox->setChecked(true);
}
else
{
alwaysADIFCheckBox->setChecked(false);
}
alwaysADIFCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getDefaultFileName()
@ -342,54 +258,22 @@ void SetupPageMisc::slotOpenFileButtonClicked()
QString SetupPageMisc::getUseDefaultName()
{
if (useDefaultName->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(useDefaultName->isChecked());
}
void SetupPageMisc::setUseDefaultName(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
useDefaultName->setChecked(false);
}
else
{
useDefaultName->setChecked(true);
}
useDefaultName->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getImperial()
{
if (imperialCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(imperialCheckBox->isChecked());
}
void SetupPageMisc::setImperial(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
imperialCheckBox->setChecked(false);
}
else
{
imperialCheckBox->setChecked(true);
}
imperialCheckBox->setChecked(util->trueOrFalse(_t));
}
@ -410,109 +294,46 @@ void SetupPageMisc::slotUseDefaultButtonStateChanged(int state)
}
}
QString SetupPageMisc::getSendQSLWhenRec(){
if (sendQSLWhenRecCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
QString SetupPageMisc::getSendQSLWhenRec()
{
return util->boolToQString(sendQSLWhenRecCheckBox->isChecked());
}
void SetupPageMisc::setSendQSLWhenRec(const QString &_t){
if ( (_t.toUpper()) == "FALSE")
{
sendQSLWhenRecCheckBox->setChecked(false);
}
else
{
sendQSLWhenRecCheckBox->setChecked(true);
}
void SetupPageMisc::setSendQSLWhenRec(const QString &_t)
{
sendQSLWhenRecCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getShowStationCallSignInSearch()
{
if (showStationCallWhenSearchCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(showStationCallWhenSearchCheckBox->isChecked());
}
void SetupPageMisc::setShowStationCallSignInSearch(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
showStationCallWhenSearchCheckBox->setChecked(false);
}
else
{
showStationCallWhenSearchCheckBox->setChecked(true);
}
showStationCallWhenSearchCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getKeepMyData()
{
if (keepMyDataCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(keepMyDataCheckBox->isChecked());
}
void SetupPageMisc::setKeepMyData(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
keepMyDataCheckBox->setChecked(false);
}
else
{
keepMyDataCheckBox->setChecked(true);
}
keepMyDataCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getCompleteWithPrevious()
{
if (completeWithPreviousCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(completeWithPreviousCheckBox->isChecked());
}
void SetupPageMisc::setCompleteWithPrevious(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
completeWithPreviousCheckBox->setChecked(false);
}
else
{
completeWithPreviousCheckBox->setChecked(true);
}
completeWithPreviousCheckBox->setChecked(util->trueOrFalse(_t));
}
@ -532,40 +353,19 @@ void SetupPageMisc::slotcheckNewVersionCheckBoxClicked()
QString SetupPageMisc::getCheckNewVersions()
{
if (checkNewVersionCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(checkNewVersionCheckBox->isChecked());
}
void SetupPageMisc::setCheckNewVersions(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
checkNewVersionCheckBox->setChecked(false);
}
else
{
checkNewVersionCheckBox->setChecked(true);
}
checkNewVersionCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getReportInfo()
{
if (checkNewVersionCheckBox->isChecked())
{
if (provideCallCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(provideCallCheckBox->isChecked());
}
else
{
@ -575,14 +375,7 @@ QString SetupPageMisc::getReportInfo()
void SetupPageMisc::setReportInfo(const QString &_t)
{
if ( (_t.toUpper()) == "FALSE")
{
provideCallCheckBox->setChecked(false);
}
else
{
provideCallCheckBox->setChecked(true);
}
provideCallCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getDefaultDBPath()
@ -600,52 +393,22 @@ void SetupPageMisc::setUseDefaultDBPath(const QString &_t)
QString SetupPageMisc::getDXMarathon(){
if (useDxMarathonCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(useDxMarathonCheckBox->isChecked());
}
void SetupPageMisc::setDXMarathon(const QString &_t){
//QString st = t;
if ( (_t.toUpper()) == "FALSE")
{
useDxMarathonCheckBox->setChecked(false);
}
else
{
useDxMarathonCheckBox->setChecked(true);
}
useDxMarathonCheckBox->setChecked(util->trueOrFalse(_t));
}
QString SetupPageMisc::getDebugLog()
{
if (debugLogCheckBox->isChecked())
{
return "True";
}
else
{
return "False";
}
return util->boolToQString(debugLogCheckBox->isChecked());
}
void SetupPageMisc::setDebugLog(const QString &_t)
{
if ( (_t.toUpper()) == "TRUE")
{
debugLogCheckBox->setChecked(true);
}
else
{
debugLogCheckBox->setChecked(false);
}
debugLogCheckBox->setChecked(util->trueOrFalse(_t));
}

1
setuppages/setuppageudp.cpp
View File

@ -279,6 +279,7 @@ QString SetupPageUDP::getReaDataFromWSJTx()
void SetupPageUDP::setLogFromWSJTx(const QString t)
{
if (t.toUpper() == "TRUE")
{
logFromWSJTXCheckbox->setChecked(true);

738
translations/klog_ca.ts
View File

File diff suppressed because it is too large Load Diff

730
translations/klog_da.ts
View File

File diff suppressed because it is too large Load Diff

738
translations/klog_de.ts
View File

File diff suppressed because it is too large Load Diff

989
translations/klog_es.ts
View File

File diff suppressed because it is too large Load Diff

730
translations/klog_fi.ts
View File

File diff suppressed because it is too large Load Diff

738
translations/klog_fr.ts
View File

File diff suppressed because it is too large Load Diff

738
translations/klog_hr.ts
View File

File diff suppressed because it is too large Load Diff

738
translations/klog_it.ts
View File

File diff suppressed because it is too large Load Diff

746
translations/klog_ja.ts
View File

File diff suppressed because it is too large Load Diff

746
translations/klog_pl.ts
View File

File diff suppressed because it is too large Load Diff

1
utilities.h
View File

@ -98,7 +98,6 @@ public:
bool isValidDateFromString(const QString &_s);
bool isValidDateTimeFromString(const QString &_s);
QStringList getValidADIFFieldAndData(const QString &_b);
QString getAValidCall (const QString &_wrongCall);