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

Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into fox_rate_calculations

Browse Source
This commit is contained in:
Brian Moran
2023-05-05 10:26:19 -07:00
parent e2085b0dd5 ea0ae2b18a
commit 2c98a4741e
10 changed files with 201 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+6 -7
View File
@@ -1093,16 +1093,14 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
void MainWindow::not_GA_warning_message ()
{
/* ### TEMPORARY ###
MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X 2.6.0 made\n"
"This is a pre-release version of WSJT-X 2.7.0-rc1 made\n"
"available for testing purposes. By design it will\n"
"be nonfunctional after Mar 31, 2023.");
"be nonfunctional after Jan 15, 2024.");
auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2023, 03, 31}, {23, 59, 59, 999}, Qt::UTC}) {
if (now >= QDateTime {{2024, 01, 15}, {23, 59, 59, 999}, Qt::UTC}) {
Q_EMIT finished ();
}
*/
}
void MainWindow::initialize_fonts ()
@@ -2809,10 +2807,10 @@ void MainWindow::on_actionCopyright_Notice_triggered()
"\"The algorithms, source code, look-and-feel of WSJT-X and related "
"programs, and protocol specifications for the modes FSK441, FST4, FT8, "
"JT4, JT6M, JT9, JT65, JTMS, QRA64, Q65, MSK144 are Copyright (C) "
"2001-2022 by one or more of the following authors: Joseph Taylor, "
"2001-2023 by one or more of the following authors: Joseph Taylor, "
"K1JT; Bill Somerville, G4WJS; Steven Franke, K9AN; Nico Palermo, "
"IV3NWV; Greg Beam, KI7MT; Michael Black, W9MDB; Edson Pereira, PY2SDR; "
"Philip Karn, KA9Q; Chester Fennell, KG4IYS; Uwe Risse, DG2YCB; "
"Philip Karn, KA9Q; Uwe Risse, DG2YCB; Brian Moran, N9ADG; "
"and other members of the WSJT Development Group.\"");
MessageBox::warning_message(this, message);
}
@@ -8723,6 +8721,7 @@ void MainWindow::locationChange (QString const& location)
if (m_config.my_grid () != grid) {
m_config.set_location (grid);
genStdMsgs (m_rpt, false);
pskSetLocal ();
statusUpdate ();
}
} else {