diff --git a/logbook/adif.cpp b/logbook/adif.cpp index 16ab89e0a..4b5cb42e9 100644 --- a/logbook/adif.cpp +++ b/logbook/adif.cpp @@ -206,10 +206,15 @@ QByteArray ADIF::QSOToADIF(QString const& hisCall, QString const& hisGrid, QStri if(name!="") t += " " + name; if(operator_call!="") t+=" " + operator_call; if(xSent!="") t += " " + xSent; - if(xRcvd!="") t += " " + xRcvd; - QString t1=xRcvd.split(" ").at(1); - qDebug() << "aa0" << xRcvd << t1; - if(xRcvd!="") t += " " + t1; + if(xRcvd!="") { + t += " " + xRcvd; + QString t1=xRcvd.split(" ").at(1); + if(t1.toInt()>0) { + t += " " + t1; + } else { + t += " " + t1; + } + } return t.toLatin1(); } diff --git a/logqso.cpp b/logqso.cpp index be3ae2f88..ef3dd3778 100644 --- a/logqso.cpp +++ b/logqso.cpp @@ -92,6 +92,8 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString m_myGrid=myGrid; ui->band->setText (m_config->bands ()->find (dialFreq)); ui->loggedOperator->setText(opCall); + ui->exchSent->setText(m_xSent); + ui->exchRcvd->setText(m_xRcvd); if(bFox or bAutoLog) { accept(); } else { diff --git a/logqso.ui b/logqso.ui index 842e1b4dd..75ca35db3 100644 --- a/logqso.ui +++ b/logqso.ui @@ -7,7 +7,7 @@ 0 0 377 - 257 + 287 @@ -16,7 +16,7 @@ 0 - + @@ -390,6 +390,57 @@ + + + + + + Exch sent + + + + + + + + 120 + 16777215 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Rcvd + + + + + + + + 120 + 16777215 + + + + + + @@ -397,7 +448,7 @@ - 0 + 20 0