w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-04 08:21:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change "Enable VHF/UHF/Microwave features" to "Enable VHF and submode features", and remove the popup warning about being on a lower band.

Browse Source
This commit is contained in:
Joe Taylor 2020-06-22 15:20:41 -04:00
parent 65996b015c
commit 04e326e75a
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Configuration.ui
View File

@ -357,7 +357,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QCheckBox" name="enable_VHF_features_check_box"> <widget class="QCheckBox" name="enable_VHF_features_check_box">
<property name="text"> <property name="text">
<string>Enable VHF/UHF/Microwave features</string> <string>Enable VHF and submode features</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -3110,11 +3110,11 @@ Right click for insert and delete options.</string>
<buttongroups> <buttongroups>
<buttongroup name="CAT_handshake_button_group"/> <buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="special_op_activity_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/> <buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/> <buttongroup name="PTT_method_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

16
widgets/mainwindow.cpp
View File

@ -959,7 +959,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_bFastDone=false; m_bFastDone=false;
m_bAltV=false; m_bAltV=false;
m_bNoMoreFiles=false; m_bNoMoreFiles=false;
m_bVHFwarned=false;
m_bDoubleClicked=false; m_bDoubleClicked=false;
m_bCallingCQ=false; m_bCallingCQ=false;
m_bCheckedContest=false; m_bCheckedContest=false;
@ -4082,11 +4081,6 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
// qDebug() << "onesec" << m_mode; // 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); m_currentBand=m_config.bands()->find(m_freqNominal);
if( SpecOp::HOUND == m_config.special_op_id() ) { if( SpecOp::HOUND == m_config.special_op_id() ) {
@ -6436,7 +6430,6 @@ void MainWindow::switch_mode (Mode mode)
ui->RxFreqSpinBox->setMaximum(5000); ui->RxFreqSpinBox->setMaximum(5000);
ui->RxFreqSpinBox->setSingleStep(1); ui->RxFreqSpinBox->setSingleStep(1);
} }
m_bVHFwarned=false;
bool b=m_mode=="FreqCal"; bool b=m_mode=="FreqCal";
ui->tabWidget->setVisible(!b); ui->tabWidget->setVisible(!b);
if(b) { if(b) {
@ -6671,20 +6664,11 @@ void MainWindow::band_changed (Frequency f)
{ {
m_frequency_list_fcal_iter = m_config.frequencies ()->find (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); setRig (f);
setXIT (ui->TxFreqSpinBox->value ()); 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) void MainWindow::enable_DXCC_entity (bool on)
{ {
if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") { if (on and !m_mode.startsWith ("WSPR") and m_mode!="Echo") {

2
widgets/mainwindow.h
View File

@ -677,7 +677,6 @@ private:
bool m_tx_watchdog; // true when watchdog triggered bool m_tx_watchdog; // true when watchdog triggered
bool m_block_pwr_tooltip; bool m_block_pwr_tooltip;
bool m_PwrBandSetOK; bool m_PwrBandSetOK;
bool m_bVHFwarned;
bool m_bDisplayedOnce; bool m_bDisplayedOnce;
Frequency m_lastMonitoredFrequency; Frequency m_lastMonitoredFrequency;
double m_toneSpacing; double m_toneSpacing;
@ -762,7 +761,6 @@ private:
void tx_watchdog (bool triggered); void tx_watchdog (bool triggered);
qint64 nWidgets(QString t); qint64 nWidgets(QString t);
void displayWidgets(qint64 n); void displayWidgets(qint64 n);
void vhfWarning();
QChar current_submode () const; // returns QChar {0} if submode is not appropriate QChar current_submode () const; // returns QChar {0} if submode is not appropriate
void write_transmit_entry (QString const& file_name); void write_transmit_entry (QString const& file_name);
void selectHound(QString t); void selectHound(QString t);