w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-20 06:22:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

merged from trunk:

Browse Source 
------------------------------------------------------------------------
r7918 | bsomervi | 2017-07-16 22:42:09 +0100 (Sun, 16 Jul 2017) | 1 line

Do not show 1st Call checkbox in MSK144 mode
------------------------------------------------------------------------
r7919 | bsomervi | 2017-07-16 22:42:18 +0100 (Sun, 16 Jul 2017) | 1 line

Do not change anything if the settings dialog is cancelled
------------------------------------------------------------------------



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7920 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-07-16 21:44:32 +00:00
parent 3b15791318
commit 73f8e93eb9
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mainwindow.cpp
View File

@ -1574,24 +1574,24 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
if(m_mode=="WSPR-LF") on_actionWSPR_LF_triggered(); if(m_mode=="WSPR-LF") on_actionWSPR_LF_triggered();
if(m_mode=="Echo") on_actionEcho_triggered(); if(m_mode=="Echo") on_actionEcho_triggered();
if(b) VHF_features_enabled(b); if(b) VHF_features_enabled(b);
}
m_config.transceiver_online (); m_config.transceiver_online ();
if(!m_bFastMode) setXIT (ui->TxFreqSpinBox->value ()); if(!m_bFastMode) setXIT (ui->TxFreqSpinBox->value ());
if(m_config.single_decode() or m_mode=="JT4") { if(m_config.single_decode() or m_mode=="JT4") {
ui->label_6->setText("Single-Period Decodes"); ui->label_6->setText("Single-Period Decodes");
ui->label_7->setText("Average Decodes"); ui->label_7->setText("Average Decodes");
} else { } else {
ui->label_6->setText("Band Activity"); ui->label_6->setText("Band Activity");
ui->label_7->setText("Rx Frequency"); ui->label_7->setText("Rx Frequency");
} }
update_watchdog_label (); update_watchdog_label ();
if(!m_splitMode) ui->cbCQTx->setChecked(false); if(!m_splitMode) ui->cbCQTx->setChecked(false);
if(!m_config.enable_VHF_features()) { if(!m_config.enable_VHF_features()) {
ui->actionInclude_averaging->setEnabled(false); ui->actionInclude_averaging->setEnabled(false);
ui->actionInclude_correlation->setEnabled(false); ui->actionInclude_correlation->setEnabled(false);
ui->actionInclude_averaging->setChecked(false); ui->actionInclude_averaging->setChecked(false);
ui->actionInclude_correlation->setChecked(false); ui->actionInclude_correlation->setChecked(false);
}
} }
} }
@ -4638,9 +4638,9 @@ void MainWindow::on_actionISCAT_triggered()
void MainWindow::on_actionMSK144_triggered() void MainWindow::on_actionMSK144_triggered()
{ {
m_mode="MSK144";
displayWidgets(nWidgets("101111110100000000010001")); displayWidgets(nWidgets("101111110100000000010001"));
// displayWidgets(nWidgets("101111111100000000010001")); // displayWidgets(nWidgets("101111111100000000010001"));
m_mode="MSK144";
m_modeTx="MSK144"; m_modeTx="MSK144";
ui->actionMSK144->setChecked(true); ui->actionMSK144->setChecked(true);
switch_mode (Modes::MSK144); switch_mode (Modes::MSK144);
@ -4759,8 +4759,8 @@ void MainWindow::on_actionEcho_triggered()
void MainWindow::on_actionFreqCal_triggered() void MainWindow::on_actionFreqCal_triggered()
{ {
on_actionJT9_triggered(); on_actionJT9_triggered();
displayWidgets(nWidgets("001101000000000000000000"));
m_mode="FreqCal"; m_mode="FreqCal";
displayWidgets(nWidgets("001101000000000000000000"));
ui->actionFreqCal->setChecked(true); ui->actionFreqCal->setChecked(true);
switch_mode(Modes::FreqCal); switch_mode(Modes::FreqCal);
m_wideGraph->setMode(m_mode); m_wideGraph->setMode(m_mode);