From 176e58a4b6c958567c6e15a8293df45469814e90 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 16 Jul 2017 15:27:50 +0000 Subject: [PATCH] Merged from trunk: ------------------------------------------------------------------------ r7865 | k1jt | 2017-07-13 13:57:44 +0100 (Thu, 13 Jul 2017) | 1 line Fix typo in doc. Fix label on/off in WSPR_config. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7908 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- doc/user_guide/en/protocols.adoc | 2 +- mainwindow.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/user_guide/en/protocols.adoc b/doc/user_guide/en/protocols.adoc index 5fc53ec66..3ccf00ec9 100644 --- a/doc/user_guide/en/protocols.adoc +++ b/doc/user_guide/en/protocols.adoc @@ -331,6 +331,6 @@ and your QSO partner ± 200 Hz. |JT9F |K=32, r=1/2|(206,72)| 8| 9-FSK| 50.0 | 450 | 0.19| 1.700 |JT9G |K=32, r=1/2|(206,72)| 8| 9-FSK|100.0 | 900 | 0.19| 0.850 |JT9H |K=32, r=1/2|(206,72)| 8| 9-FSK|200.0 | 1800 | 0.19| 0.425 -|MSK144 |LDPC |(128,72)| 2| OQPSK| 2000 | 2400 | 0.11| 0.072 +|MSK144 |LDPC |(128,80)| 2| OQPSK| 2000 | 2400 | 0.11| 0.072 |MSK144 Sh|LDPC |(32,16) | 2| OQPSK| 2000 | 2400 | 0.20| 0.020 |===================================================================== diff --git a/mainwindow.cpp b/mainwindow.cpp index e58fdea65..fb17ee345 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -4812,13 +4812,13 @@ void MainWindow::switch_mode (Mode mode) void MainWindow::WSPR_config(bool b) { ui->decodedTextBrowser2->setVisible(!b); - ui->decodedTextLabel2->setVisible(!b); + ui->decodedTextLabel2->setVisible(!b and ui->cbMenus->isChecked()); ui->controls_stack_widget->setCurrentIndex (b && m_mode != "Echo" ? 1 : 0); ui->QSO_controls_widget->setVisible (!b); ui->DX_controls_widget->setVisible (!b); ui->WSPR_controls_widget->setVisible (b); - ui->label_6->setVisible(!b); - ui->label_7->setVisible(!b); + ui->label_6->setVisible(!b and ui->cbMenus->isChecked()); + ui->label_7->setVisible(!b and ui->cbMenus->isChecked()); ui->logQSOButton->setVisible(!b); ui->DecodeButton->setEnabled(!b); if(b and (m_mode!="Echo")) {