diff --git a/Versions.cmake b/Versions.cmake index 3e2fc87cd..cf6664e14 100644 --- a/Versions.cmake +++ b/Versions.cmake @@ -1,6 +1,6 @@ # Version number components set (WSJTX_VERSION_MAJOR 2) -set (WSJTX_VERSION_MINOR 1) +set (WSJTX_VERSION_MINOR 2) set (WSJTX_VERSION_PATCH 0) -set (WSJTX_RC 8) # release candidate number, comment out or zero for development versions +set (WSJTX_RC 0) # release candidate number, comment out or zero for development versions set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 7090a609d..fafdf3fe4 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -984,20 +984,20 @@ 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.1.0 made " - "available for testing purposes. By design it will " - "be nonfunctional during the 2019 ARRL June VHF contest " - "(June 8-10) and Field Day (June 22-23) weekends. It " - "will be permanently nonfunctional after July 21, 2019."); - auto now = QDateTime::currentDateTimeUtc (); - if ((QDateTime {{2019, 6, 8}, {18, 0}, Qt::UTC} <= now - && now < QDateTime {{2019, 6, 10}, {3, 0}, Qt::UTC}) - || now >= QDateTime {{2019, 7, 21}, {0, 0}, Qt::UTC}) - { - Q_EMIT finished (); - } + // MessageBox::critical_message (this, + // "

" + // "This is a pre-release version of WSJT-X 2.1.0 made " + // "available for testing purposes. By design it will " + // "be nonfunctional during the 2019 ARRL June VHF contest " + // "(June 8-10) and Field Day (June 22-23) weekends. It " + // "will be permanently nonfunctional after July 21, 2019."); + // auto now = QDateTime::currentDateTimeUtc (); + // if ((QDateTime {{2019, 6, 8}, {18, 0}, Qt::UTC} <= now + // && now < QDateTime {{2019, 6, 10}, {3, 0}, Qt::UTC}) + // || now >= QDateTime {{2019, 7, 21}, {0, 0}, Qt::UTC}) + // { + // Q_EMIT finished (); + // } } void MainWindow::initialize_fonts ()