w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-16 09:01:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged develop into feat-refactor

Browse Source
This commit is contained in:
Chris Karpinsky 2019-07-02 13:11:40 -05:00
commit a30d97fb57
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Versions.cmake
View File

@ -1,6 +1,6 @@
# Version number components # Version number components
set (WSJTX_VERSION_MAJOR 2) set (WSJTX_VERSION_MAJOR 2)
set (WSJTX_VERSION_MINOR 1) set (WSJTX_VERSION_MINOR 2)
set (WSJTX_VERSION_PATCH 0) 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 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build

28
widgets/mainwindow.cpp
View File

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