Merge branch 'develop' into feat-boost-log

This commit is contained in:
Bill Somerville
2020-09-27 00:30:32 +01:00
20 changed files with 296 additions and 199 deletions
+9 -9
View File
@@ -1044,14 +1044,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message ()
{
// MessageBox::critical_message (this,
// "This is a pre-release version of WSJT-X 2.2.0 made\n"
// "available for testing purposes. By design it will\n"
// "be nonfunctional after 0000 UTC on June 10, 2020.");
// auto now = QDateTime::currentDateTimeUtc ();
// if (now >= QDateTime {{2020, 6, 10}, {0, 0}, Qt::UTC}) {
// Q_EMIT finished ();
// }
MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.3.0 made\n"
"available for testing purposes. By design it will\n"
"be nonfunctional after 0000 UTC on Nov 17, 2020.");
auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2020, 11, 17}, {0, 0}, Qt::UTC}) {
Q_EMIT finished ();
}
}
void MainWindow::initialize_fonts ()
@@ -7459,7 +7459,7 @@ void MainWindow::transmitDisplay (bool transmitting)
auto QSY_allowed = !transmitting or m_config.tx_QSY_allowed () or
!m_config.split_mode ();
if (ui->cbHoldTxFreq->isChecked ()) {
ui->RxFreqSpinBox->setEnabled (QSY_allowed);
ui->TxFreqSpinBox->setEnabled (QSY_allowed);
ui->pbT2R->setEnabled (QSY_allowed);
}