w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 04:42:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clear generated messages when clearing DX after logging

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5623 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-06-18 22:18:05 +00:00
parent 756c353fe8
commit 9719ea02b4
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mainwindow.cpp
View File

@ -1063,26 +1063,7 @@ void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent
} }
break; break;
case Qt::Key_F4: case Qt::Key_F4:
ui->dxCallEntry->setText(""); clearDX ();
ui->dxGridEntry->setText("");
m_hisCall="";
m_hisGrid="";
m_rptSent="";
m_rptRcvd="";
m_qsoStart="";
m_qsoStop="";
genStdMsgs("");
if (1 == ui->tabWidget->currentIndex())
{
ui->genMsg->setText(ui->tx6->text());
m_ntx=7;
ui->rbGenMsg->setChecked(true);
}
else
{
m_ntx=6;
ui->txrb6->setChecked(true);
}
return; return;
case Qt::Key_F6: case Qt::Key_F6:
if(e->modifiers() & Qt::ShiftModifier) { if(e->modifiers() & Qt::ShiftModifier) {
@ -2679,6 +2660,30 @@ void MainWindow::genStdMsgs(QString rpt) //genStdMsgs()
m_rpt=rpt; m_rpt=rpt;
} }
void MainWindow::clearDX ()
{
ui->dxCallEntry->setText("");
ui->dxGridEntry->setText("");
m_hisCall="";
m_hisGrid="";
m_rptSent="";
m_rptRcvd="";
m_qsoStart="";
m_qsoStop="";
genStdMsgs("");
if (1 == ui->tabWidget->currentIndex())
{
ui->genMsg->setText(ui->tx6->text());
m_ntx=7;
ui->rbGenMsg->setChecked(true);
}
else
{
m_ntx=6;
ui->txrb6->setChecked(true);
}
}
void MainWindow::lookup() //lookup() void MainWindow::lookup() //lookup()
{ {
QString hisCall=ui->dxCallEntry->text().toUpper().trimmed(); QString hisCall=ui->dxCallEntry->text().toUpper().trimmed();
@ -2952,14 +2957,7 @@ void MainWindow::acceptQSO2(QDateTime const& QSO_date, QString const& call, QStr
if (m_config.clear_DX ()) if (m_config.clear_DX ())
{ {
m_hisCall=""; clearDX ();
ui->dxCallEntry->setText("");
m_hisGrid="";
ui->dxGridEntry->setText("");
m_rptSent="";
m_rptRcvd="";
m_qsoStart="";
m_qsoStop="";
} }
} }

1
mainwindow.h
View File

@ -490,6 +490,7 @@ private:
void updateStatusBar(); void updateStatusBar();
void msgBox(QString t); void msgBox(QString t);
void genStdMsgs(QString rpt); void genStdMsgs(QString rpt);
void clearDX ();
void lookup(); void lookup();
void ba2msg(QByteArray ba, char* message); void ba2msg(QByteArray ba, char* message);
void msgtype(QString t, QLineEdit* tx); void msgtype(QString t, QLineEdit* tx);