diff --git a/mainwindow.cpp b/mainwindow.cpp index c6231b9f2..f0f8210cb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1199,6 +1199,8 @@ void MainWindow::setContestType() if(m_config.bEU_VHF_Contest()) m_nContest=EU_VHF; if(m_config.bFieldDay()) m_nContest=FIELD_DAY; if(m_config.bRTTYroundup()) m_nContest=RTTY; + if(m_config.bFox()) m_nContest=FOX; + if(m_config.bHound()) m_nContest=HOUND; } void MainWindow::set_application_font (QFont const& font) @@ -2388,7 +2390,7 @@ void MainWindow::on_actionAstronomical_data_toggled (bool checked) void MainWindow::on_actionFox_Log_triggered() { on_actionMessage_averaging_triggered(); - m_msgAvgWidget->foxLogSetup(); + m_msgAvgWidget->foxLogSetup(m_nContest); } void MainWindow::on_actionColors_triggered() @@ -3753,7 +3755,7 @@ void MainWindow::guiUpdate() //Once per second: if(nsec != m_sec0) { -// qDebug() << "OneSec:" << m_config.autoLog(); + qDebug() << "OneSec:" << m_nContest; if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { if(!m_bVHFwarned) vhfWarning(); diff --git a/mainwindow.h b/mainwindow.h index 94f009871..607c832bd 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -518,7 +518,9 @@ private: NA_VHF, EU_VHF, FIELD_DAY, - RTTY + RTTY, + FOX, + HOUND } m_nContest; //Contest type enum {CALL, GRID, DXCC, MULT}; diff --git a/mainwindow.ui b/mainwindow.ui index afab96456..b93653962 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -3304,6 +3304,11 @@ QPushButton[state="ok"] { Color highlighting scheme + + + Contest Log + + diff --git a/messageaveraging.cpp b/messageaveraging.cpp index 052de7273..0711d93b6 100644 --- a/messageaveraging.cpp +++ b/messageaveraging.cpp @@ -88,9 +88,23 @@ void MessageAveraging::displayAvg(QString const& t) ui->msgAvgPlainTextEdit->setPlainText(t); } -void MessageAveraging::foxLogSetup() +void MessageAveraging::foxLogSetup(int nContest) { - m_title_=QApplication::applicationName () + " - Fox Log"; + if(nContest==5) { + m_title_=QApplication::applicationName () + " - Fox Log"; + setWindowTitle(m_title_); + ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band"); + } + if(nContest>0 and nContest<5) { + m_title_=QApplication::applicationName () + " - Contest Log"; + setWindowTitle(m_title_); + ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band"); + } +} + +void MessageAveraging::contestLogSetup() +{ + m_title_=QApplication::applicationName () + " - Contest Log"; setWindowTitle(m_title_); ui->header_label->setText(" Date Time Call Grid Sent Rcvd Band"); } diff --git a/messageaveraging.h b/messageaveraging.h index ea8e06b9e..6705bceed 100644 --- a/messageaveraging.h +++ b/messageaveraging.h @@ -17,7 +17,8 @@ public: ~MessageAveraging(); void displayAvg(QString const&); void changeFont (QFont const&); - void foxLogSetup(); + void foxLogSetup(int nContest); + void contestLogSetup(); void foxLabCallers(int n); void foxLabQueued(int n); void foxLabRate(int n);