diff --git a/Configuration.ui b/Configuration.ui index fa16476e9..44a57af24 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -357,7 +357,7 @@ - Enable VHF/UHF/Microwave features + Enable VHF and submode features @@ -3110,11 +3110,11 @@ Right click for insert and delete options. - + + - diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 750e40520..6b17d8e24 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -959,7 +959,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_bFastDone=false; m_bAltV=false; m_bNoMoreFiles=false; - m_bVHFwarned=false; m_bDoubleClicked=false; m_bCallingCQ=false; m_bCheckedContest=false; @@ -4082,11 +4081,6 @@ void MainWindow::guiUpdate() //Once per second: if(nsec != m_sec0) { // qDebug() << "onesec" << m_mode; - if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { - if(!m_bVHFwarned) vhfWarning(); - } else { - m_bVHFwarned=false; - } m_currentBand=m_config.bands()->find(m_freqNominal); if( SpecOp::HOUND == m_config.special_op_id() ) { @@ -6436,7 +6430,6 @@ void MainWindow::switch_mode (Mode mode) ui->RxFreqSpinBox->setMaximum(5000); ui->RxFreqSpinBox->setSingleStep(1); } - m_bVHFwarned=false; bool b=m_mode=="FreqCal"; ui->tabWidget->setVisible(!b); if(b) { @@ -6671,20 +6664,11 @@ void MainWindow::band_changed (Frequency f) { m_frequency_list_fcal_iter = m_config.frequencies ()->find (f); } - float r=m_freqNominal/(f+0.0001); - if(r<0.9 or r>1.1) m_bVHFwarned=false; setRig (f); setXIT (ui->TxFreqSpinBox->value ()); } } -void MainWindow::vhfWarning() -{ - MessageBox::warning_message (this, tr ("VHF features warning"), - "VHF/UHF/Microwave features is enabled on a lower frequency band."); - m_bVHFwarned=true; -} - void MainWindow::enable_DXCC_entity (bool on) { if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") { diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index ac8c22d15..51a935c93 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -677,7 +677,6 @@ private: bool m_tx_watchdog; // true when watchdog triggered bool m_block_pwr_tooltip; bool m_PwrBandSetOK; - bool m_bVHFwarned; bool m_bDisplayedOnce; Frequency m_lastMonitoredFrequency; double m_toneSpacing; @@ -762,7 +761,6 @@ private: void tx_watchdog (bool triggered); qint64 nWidgets(QString t); void displayWidgets(qint64 n); - void vhfWarning(); QChar current_submode () const; // returns QChar {0} if submode is not appropriate void write_transmit_entry (QString const& file_name); void selectHound(QString t);