From b252c11815749beb7bbe739e3ea2f3ef217622d5 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 9 Jul 2018 14:33:56 -0400 Subject: [PATCH] Bright red label to flag Fox, Hound, or use of new 77-bit message styles. --- Configuration.cpp | 11 +++++++++-- mainwindow.cpp | 25 ++++++++++++++----------- mainwindow.ui | 15 +++++++++++++++ 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index cca0b4221..53230fd2e 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -1960,6 +1960,7 @@ void Configuration::impl::accept () twoPass_ = ui_->cbTwoPass->isChecked (); bFox_ = ui_->cbFox->isChecked (); bHound_ = ui_->cbHound->isChecked (); + if(bFox_ or bHound_) ui_->rbNone->setChecked(true); //### bGenerate77_ = ui_->cbGenerate77->isChecked(); bDecode77_ = ui_->cbDecode77->isChecked(); bNoSpecial_ = ui_->rbNone->isChecked (); @@ -2453,12 +2454,18 @@ void Configuration::impl::on_calibration_slope_ppm_spin_box_valueChanged (double void Configuration::impl::on_cbFox_clicked (bool checked) { - if (checked) ui_->cbHound->setChecked (false); + if(checked) { + ui_->cbHound->setChecked (false); + ui_->rbNone->setChecked(true); + } } void Configuration::impl::on_cbHound_clicked (bool checked) { - if (checked) ui_->cbFox->setChecked (false); + if(checked) { + ui_->cbFox->setChecked (false); + ui_->rbNone->setChecked(true); + } } void Configuration::impl::on_cbx2ToneSpacing_clicked(bool b) diff --git a/mainwindow.cpp b/mainwindow.cpp index 40fadaf04..3cabae51f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -718,6 +718,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_msg[0][0]=0; m_bQRAsyncWarned=false; ui->labDXped->setVisible(false); + ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}"); for(int i=0; i<28; i++) { //Initialize dBm values float dbm=(10.0*i)/3.0 - 30.0; @@ -5181,17 +5182,19 @@ void MainWindow::on_actionFT8_triggered() ui->txb6->setEnabled(false); } - QString t0=""; - if(m_config.bEU_VHF_Contest()) t0="EU VHF"; - if(m_config.bNA_VHF_Contest()) t0="NA VHF"; - if(m_config.bFieldDay()) t0="FD"; - if(m_config.bRTTYroundup()) t0=="RTTY"; - if(m_config.bGenerate77()) t0+=" 2"; - if(t0=="") { - ui->labDXped->setVisible(false); - } else { - ui->labDXped->setVisible(true); - ui->labDXped->setText("*** " + t0 + " ***"); + if(!m_config.bFox() and !m_config.bHound()) { + QString t0=""; + if(m_config.bEU_VHF_Contest()) t0="EU VHF"; + if(m_config.bNA_VHF_Contest()) t0="NA VHF"; + if(m_config.bFieldDay()) t0="FD"; + if(m_config.bRTTYroundup()) t0=="RTTY"; + if(m_config.bGenerate77()) t0+=" 2"; + if(t0=="") { + ui->labDXped->setVisible(false); + } else { + ui->labDXped->setVisible(true); + ui->labDXped->setText(t0); + } } if((m_config.bFox() or m_config.bHound()) and !m_config.split_mode() and !m_bWarnedSplit) { diff --git a/mainwindow.ui b/mainwindow.ui index d10ed95df..8d1b9a521 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -872,9 +872,24 @@ QLabel[oob="true"] { + + + 0 + 0 + + + + + 100 + 16777215 + + Fox + + Qt::AlignCenter +