From f3e838cdc6594c01ddc97f813f2fced153923518 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Sat, 19 Mar 2022 09:07:06 -0400 Subject: [PATCH] Max Pts ==> Max Dist, and allow with non-contest messages. --- widgets/mainwindow.cpp | 18 ++---------------- widgets/mainwindow.h | 1 - 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index c187e3eb7..9d7db1959 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -856,7 +856,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, } ui->respondComboBox->addItem("CQ: None"); ui->respondComboBox->addItem("CQ: First"); - ui->respondComboBox->addItem("CQ: Max Pts"); + ui->respondComboBox->addItem("CQ: Max Dist"); m_dateTimeRcvdRR73=QDateTime::currentDateTimeUtc(); m_dateTimeSentTx3=QDateTime::currentDateTimeUtc(); @@ -1024,9 +1024,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, } ui->pbBestSP->setVisible(m_mode=="FT4"); - int n=ui->respondComboBox->currentIndex(); - if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n>1) n=0; - ui->respondComboBox->setCurrentIndex(n); // this must be the last statement of constructor if (!m_valid) throw std::runtime_error {"Fatal initialization exception"}; @@ -1919,9 +1916,6 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog MessageBox::information_message (this, "Fox-and-Hound operation is available only in FT8 mode.\nGo back and change your selection."); } - int n=ui->respondComboBox->currentIndex(); - if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n>1) n=1; - ui->respondComboBox->setCurrentIndex(n); } } @@ -3708,7 +3702,7 @@ void MainWindow::readFromStdout() //readFromStdout processMessage (decodedtext); } - if(ui->respondComboBox->currentText()=="CQ: Max Pts") { + if(ui->respondComboBox->currentText()=="CQ: Max Dist") { QString deCall; QString deGrid; decodedtext.deCallAndGrid(/*out*/deCall,deGrid); @@ -8766,14 +8760,6 @@ void MainWindow::on_cbCQonly_toggled(bool) decodeBusy(true); } -void MainWindow::on_respondComboBox_currentIndexChanged (int n) -{ - if(m_config.special_op_id()!=SpecOp::ARRL_DIGI and n==2) { - ui->respondComboBox->setCurrentIndex(1); - MessageBox::warning_message (this, tr ("\"CQ: Max Pts\" is available only\n in ARRL DIGI contest mode."));\ - } -} - void MainWindow::on_cbAutoSeq_toggled(bool b) { ui->respondComboBox->setVisible((m_mode=="FT8" or m_mode=="FT4" or m_mode=="FST4" diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index 0ce0bc33f..d1c94984d 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -325,7 +325,6 @@ private slots: void chk_FST4_freq_range(); void on_pbFoxReset_clicked(); void on_comboBoxHoundSort_activated (int index); - void on_respondComboBox_currentIndexChanged(int index); void not_GA_warning_message (); void checkMSK144ContestType(); void on_pbBestSP_clicked();