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

Merge branch 'release-2.5.0' of bitbucket.org:k1jt/wsjtx into release-2.5.0

Browse Source
This commit is contained in:
Joe Taylor 2021-06-24 10:37:57 -04:00
commit 9397bdfbea
4 changed files with 615 additions and 600 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Release_Notes.txt
View File

@ -12,6 +12,10 @@
Copyright 2001 - 2021 by Joe Taylor, K1JT. Copyright 2001 - 2021 by Joe Taylor, K1JT.
Release: WSJT-X 2.5.0-rc2
Jun 28, 2021
-------------------------
Release: WSJT-X 2.5.0-rc1 Release: WSJT-X 2.5.0-rc1
Jun 3, 2021 Jun 3, 2021
------------------------- -------------------------

1206
cty.dat
View File

File diff suppressed because it is too large Load Diff

2
map65/main.cpp
View File

@ -19,7 +19,7 @@ int main(int argc, char *argv[])
QApplication a {argc, argv}; QApplication a {argc, argv};
// Override programs executable basename as application name. // Override programs executable basename as application name.
a.setApplicationName ("MAP65"); a.setApplicationName ("MAP65");
a.setApplicationVersion ("3.0.0-devel"); a.setApplicationVersion ("3.0.0-rc2");
// switch off as we share an Info.plist file with WSJT-X // switch off as we share an Info.plist file with WSJT-X
a.setAttribute (Qt::AA_DontUseNativeMenuBar); a.setAttribute (Qt::AA_DontUseNativeMenuBar);
MainWindow w; MainWindow w;

3
widgets/mainwindow.cpp
View File

@ -1028,7 +1028,7 @@ 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,
"This is a pre-release version of WSJT-X 2.5.0 made\n" "This is a pre-release version of WSJT-X 2.5.0 made\n"
"available for testing purposes. By design it will\n" "available for testing purposes. By design it will\n"
@ -1037,7 +1037,6 @@ void MainWindow::not_GA_warning_message ()
if (now >= QDateTime {{2021, 8, 31}, {23, 59, 59, 999}, Qt::UTC}) { if (now >= QDateTime {{2021, 8, 31}, {23, 59, 59, 999}, Qt::UTC}) {
Q_EMIT finished (); Q_EMIT finished ();
} }
*/
} }
void MainWindow::initialize_fonts () void MainWindow::initialize_fonts ()