From 47c0fd15f96a4d9300799080a03e31a6ebc21d62 Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sat, 31 Dec 2022 22:17:20 +0100 Subject: [PATCH 01/21] Change the User Guide URL to SourceForge. --- widgets/mainwindow.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 13379b8ac..2748ca6e8 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -2655,9 +2655,7 @@ void MainWindow::on_actionQSG_X250_M3_triggered() void MainWindow::on_actionOnline_User_Guide_triggered() //Display manual { -#if defined (CMAKE_BUILD) - m_manual.display_html_url (QUrl {PROJECT_MANUAL_DIRECTORY_URL}, PROJECT_MANUAL); -#endif + QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/wsjtx-main_en.html"}); } //Display local copy of manual From 434b0ec4e46c0d005c00961e2e53f5b370874cbc Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sat, 31 Dec 2022 22:41:56 +0100 Subject: [PATCH 02/21] Revert "Change the User Guide URL to SourceForge." This reverts commit 47c0fd15f96a4d9300799080a03e31a6ebc21d62. --- widgets/mainwindow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 2748ca6e8..13379b8ac 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -2655,7 +2655,9 @@ void MainWindow::on_actionQSG_X250_M3_triggered() void MainWindow::on_actionOnline_User_Guide_triggered() //Display manual { - QDesktopServices::openUrl (QUrl {"https://wsjt.sourceforge.io/wsjtx-main_en.html"}); +#if defined (CMAKE_BUILD) + m_manual.display_html_url (QUrl {PROJECT_MANUAL_DIRECTORY_URL}, PROJECT_MANUAL); +#endif } //Display local copy of manual From 75a4dcdc4e5b7b47784cbfa7708254fb68050ecc Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sat, 31 Dec 2022 22:43:23 +0100 Subject: [PATCH 03/21] Change the User Guide URL in CMakeLists.txt. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef5d688a8..e16965830 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,9 +81,9 @@ set (PROJECT_BUNDLE_NAME "WSJT-X") set (PROJECT_VENDOR "Joe Taylor, K1JT") set (PROJECT_CONTACT "Joe Taylor <k1jt@arrl.net>") set (PROJECT_COPYRIGHT "Copyright (C) 2001-2023 by Joe Taylor, K1JT") -set (PROJECT_HOMEPAGE https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html) +set (PROJECT_HOMEPAGE https://wsjt.sourceforge.io/wsjtx.html) set (PROJECT_MANUAL wsjtx-main) -set (PROJECT_MANUAL_DIRECTORY_URL https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/) +set (PROJECT_MANUAL_DIRECTORY_URL https://wsjt.sourceforge.io/wsjtx-doc/) set (PROJECT_SAMPLES_URL http://downloads.sourceforge.net/project/wsjt/) set (PROJECT_SAMPLES_UPLOAD_DEST frs.sourceforge.net:/home/frs/project/wsjt/) From b15b0790ad206daae2ea5145851c124b5d0c75a9 Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sun, 1 Jan 2023 10:03:55 +0100 Subject: [PATCH 04/21] Final changes to the Release Notes. --- NEWS | 4 +++- Release_Notes.txt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index d4f755648..7d44f83eb 100644 --- a/NEWS +++ b/NEWS @@ -12,12 +12,14 @@ Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team Release: WSJT-X 2.6.0 - January 2, 2023 + January 6, 2023 ------------------------- WSJT-X 2.6.0 is a General Availability (GA) release, the first since version 2.5.4. Its major enhancements include the following: + - Mode selection buttons on main window for FT4, FT8, JT65, MSK144, + Q65, and FT8's Hound mode - Support for the ARRL International DX Contest - Performance enhancements for the FT8 and Q65 modes - New features for EME Echo mode, including calibrated SNR reports diff --git a/Release_Notes.txt b/Release_Notes.txt index f748bfd5e..c4e164954 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -12,12 +12,14 @@ Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team Release: WSJT-X 2.6.0 - January 2, 2023 + January 6, 2023 ------------------------- WSJT-X 2.6.0 is a General Availability (GA) release, the first since version 2.5.4. Its major enhancements include the following: + - Mode selection buttons on main window for FT4, FT8, JT65, MSK144, + Q65, and FT8's Hound mode - Support for the ARRL International DX Contest - Performance enhancements for the FT8 and Q65 modes - New features for EME Echo mode, including calibrated SNR reports From d2f8251d96fb4f272009280d264620c55f36ab8e Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Fri, 6 Jan 2023 16:59:48 +0100 Subject: [PATCH 05/21] Change the path to the FMT_User.pdf file. --- doc/user_guide/en/measurement_tools.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user_guide/en/measurement_tools.adoc b/doc/user_guide/en/measurement_tools.adoc index fe501d650..492a370dc 100644 --- a/doc/user_guide/en/measurement_tools.adoc +++ b/doc/user_guide/en/measurement_tools.adoc @@ -70,7 +70,7 @@ and slope of a straight line to the whole sequence of calibration measurements, as shown for these measurements in the graph plotted below. Software tools for completing this task are included with the _WSJT-X_ installation, and detailed instructions for their use are -available at https://physics.princeton.edu/pulsar/k1jt/FMT_User.pdf. +available at https://wsjt.sourceforge.io/FMT_User.pdf. Using these tools and no specialized hardware beyond your CAT-interfaced radio, you can calibrate the radio to better than 1 Hz From 245ebfa4d6807dbb91298394d7b13dc88668ed4b Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Fri, 6 Jan 2023 17:28:38 +0100 Subject: [PATCH 06/21] Change some more URLs to our new "wsjt.sourceforge.io" home page. --- doc/common/links.adoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/common/links.adoc b/doc/common/links.adoc index 17ae26203..6bcdbce6b 100644 --- a/doc/common/links.adoc +++ b/doc/common/links.adoc @@ -54,7 +54,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :raspbian: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_armhf.deb[wsjtx_{VERSION}_armhf.deb] :raspbian64: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx_{VERSION}_arm64.deb[wsjtx_{VERSION}_arm64.deb] :debian: https://www.debian.org/[Debian] -:dev_guide: https://www.physics.princeton.edu/pulsar/K1JT/wsjtx-doc/wsjt-dev-guide.html[Dev-Guide] +:dev_guide: https://wsjt.sourceforge.io/wsjtx-doc/wsjt-dev-guide.html[Dev-Guide] :devsvn: https://sourceforge.net/p/wsjt/wsjt/HEAD/tree/[Devel-SVN] :devrepo: https://sourceforge.net/p/wsjt/wsjtx/ci/master/tree/[SourceForge] :dimension4: http://www.thinkman.com/dimension4/[Thinking Man Software] @@ -67,11 +67,11 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :fmt_arrl: https://www.arrl.org/frequency-measuring-test[ARRL FMT Info] :fmt_group: https://groups.yahoo.com/neo/groups/FMT-nuts/info[FMT Group] :fmt_k5cm: http://www.k5cm.com/[FMT Event Info] -:fmt_wspr: https://www.physics.princeton.edu/pulsar/K1JT/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup] -:ft4_protocol: https://physics.princeton.edu/pulsar/k1jt/FT4_Protocol.pdf[The FT4 Protocol for Digital Contesting] -:ft4_ft8_protocols: https://physics.princeton.edu/pulsar/k1jt/FT4_FT8_QEX.pdf[The FT4 and FT8 Communication Protocols] +:fmt_wspr: https://wsjt.sourceforge.io/FMT_User.pdf[Accurate Frequency Measurements with your WSPR Setup] +:ft4_protocol: https://wsjt.sourceforge.io/FT4_Protocol.pdf[The FT4 Protocol for Digital Contesting] +:ft4_ft8_protocols: https://wsjt.sourceforge.io/FT4_FT8_QEX.pdf[The FT4 and FT8 Communication Protocols] :ft8_tips: https://www.g4ifb.com/FT8_Hinson_tips_for_HF_DXers.pdf[FT8 Operating Guide] -:ft8_DXped: https://physics.princeton.edu/pulsar/k1jt/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] +:ft8_DXped: https://wsjt.sourceforge.io/FT8_DXpedition_Mode.pdf[FT8 DXpedition Mode] :gnu_gpl: https://www.gnu.org/licenses/gpl-3.0.txt[GNU General Public License] :homepage: https://wsjt.sourceforge.io/index.html[WSJT Home Page] :hrd: http://www.hrdsoftwarellc.com/[Ham Radio Deluxe] @@ -81,7 +81,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :launchpadki7mt: https://launchpad.net/~ki7mt[KI7MT PPA's] :log4om: https://www.log4om.com[Log4OM] :lunarEchoes: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/LunarEchoes_QEX.pdf[QEX] -:msk144: https://physics.princeton.edu/pulsar/k1jt/MSK144_Protocol_QEX.pdf[QEX] +:msk144: https://wsjt.sourceforge.io/MSK144_Protocol_QEX.pdf[QEX] :msvcpp_redist: https://www.microsoft.com/en-ph/download/details.aspx?id=40784[Microsoft VC++ 2013 Redistributable] :msys_url: https://sourceforge.net/projects/mingwbuilds/files/external-binary-packages/[MSYS Download] :n1mm_logger: https://n1mm.hamdocs.com/tiki-index.php[N1MM Logger+] @@ -100,7 +100,7 @@ d). Edit lines as needed. Keeping them in alphabetic order help see dupes. :wsjtx_group: https://groups.io/g/WSJTX[WSJTX Group] :wsjtx_group2: https://groups.io/g/WSJTX[join the group] :wsjtx: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wsjtx.html[WSJT-X] -:wspr0_guide: https://www.physics.princeton.edu/pulsar/K1JT/WSPR0_Instructions.TXT[WSPR0 Guide] +:wspr0_guide: https://wsjt.sourceforge.io/WSPR0_Instructions.TXT[WSPR0 Guide] :wspr: https://sourceforge.net/projects/wsjt/files/wsjtx-{VERSION}/wspr.html[WSPR Home Page] :wsprnet: https://wsprnet.org/drupal/[WSPRnet] :wsprnet_activity: https://wsprnet.org/drupal/wsprnet/activity[WSPRnet Activity page] From 9e6ecbe8f4b507977a3bcaeb0a73f0fa1bb1635e Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Fri, 6 Jan 2023 15:10:44 -0500 Subject: [PATCH 07/21] Don't call fast_config() after setting displayWidgets() when entering Q65 mode. It kills the T/R period spinner. Should have been inincluded in v2.6.0 !! --- widgets/mainwindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 13379b8ac..977946d03 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -7041,7 +7041,6 @@ void MainWindow::on_actionQ65_triggered() ui->rh_decodes_title_label->setText(tr ("Average Decodes")); ui->lh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); ui->rh_decodes_headings_label->setText("UTC dB DT Freq " + tr ("Message")); - fast_config(m_bFastMode); statusChanged(); m_specOp=m_config.special_op_id(); From 9e6de4fab439ae888c5e3a4060017c59f8a7d6b4 Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Fri, 6 Jan 2023 15:13:29 -0500 Subject: [PATCH 08/21] Correct the improper reference to "ARRL International DX Contest" in Releasr Notes. --- Release_Notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Release_Notes.txt b/Release_Notes.txt index c4e164954..098ab5e27 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -20,7 +20,7 @@ version 2.5.4. Its major enhancements include the following: - Mode selection buttons on main window for FT4, FT8, JT65, MSK144, Q65, and FT8's Hound mode - - Support for the ARRL International DX Contest + - Support for the ARRL International Digital Contest - Performance enhancements for the FT8 and Q65 modes - New features for EME Echo mode, including calibrated SNR reports - Several new convenience features for Fox operators From 0fd1f748fd18f87efdafabfa21e1e4385ea71050 Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sat, 7 Jan 2023 09:57:14 +0100 Subject: [PATCH 09/21] Better initialization of the decoded text font. --- widgets/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 977946d03..2f9d68a44 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -663,9 +663,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, connect (ui->decodedTextBrowser2, &DisplayText::erased, this, &MainWindow::rx_frequency_activity_cleared); // initialize decoded text font and hook up font change signals - // defer initialization until after construction otherwise menu - // fonts do not get set - QTimer::singleShot (0, this, SLOT (initialize_fonts ())); + // defer initialization until after construction otherwise menu fonts do not get set + // with 50 ms delay we are on the save side + QTimer::singleShot (50, this, SLOT (initialize_fonts ())); connect (&m_config, &Configuration::text_font_changed, [this] (QFont const& font) { set_application_font (font); }); From 4ed849580ccaba9a70c52734cc361e344916d12a Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sat, 7 Jan 2023 10:19:38 +0100 Subject: [PATCH 10/21] Preparations for the v2.6.1 release. --- CMakeLists.txt | 2 +- NEWS | 18 +++++++++++++++++- Release_Notes.txt | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e16965830..86bc970c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ if (POLICY CMP0075) endif () project (wsjtx - VERSION 2.6.0.0 + VERSION 2.6.1.0 LANGUAGES C CXX Fortran ) set (PROJECT_DESCRIPTION "WSJT-X: Digital Modes for Weak Signal Communications in Amateur Radio") diff --git a/NEWS b/NEWS index 7d44f83eb..ab2c4a86a 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,22 @@ Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team + Release: WSJT-X 2.6.1 + January 16, 2023 + ------------------------- + +WSJT-X 2.6.1 is mostly a bug fix release for Q65. It has the following +changes since release 2.6.0: + + - Fix a flaw in Q65 mode that prevented proper display of the T/R + period spinner. + + - Correct the reference to "ARRL International Digital Contest" in the + Release Notes. + + - Make the initialization of the decoded text font more robust. + + Release: WSJT-X 2.6.0 January 6, 2023 ------------------------- @@ -20,7 +36,7 @@ version 2.5.4. Its major enhancements include the following: - Mode selection buttons on main window for FT4, FT8, JT65, MSK144, Q65, and FT8's Hound mode - - Support for the ARRL International DX Contest + - Support for the ARRL International Digital Contest - Performance enhancements for the FT8 and Q65 modes - New features for EME Echo mode, including calibrated SNR reports - Several new convenience features for Fox operators diff --git a/Release_Notes.txt b/Release_Notes.txt index 098ab5e27..4556f690b 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -11,6 +11,22 @@ Copyright 2001 - 2023 by Joe Taylor, K1JT, and the WSJT Development Team + Release: WSJT-X 2.6.1 + January 16, 2023 + ------------------------- + +WSJT-X 2.6.1 is mostly a bug fix release for Q65. It has the following +changes since release 2.6.0: + + - Fix a flaw in Q65 mode that prevented proper display of the T/R + period spinner. + + - Correct the reference to "ARRL International Digital Contest" in the + Release Notes. + + - Make the initialization of the decoded text font more robust. + + Release: WSJT-X 2.6.0 January 6, 2023 ------------------------- From 02bf562712868e1877c98e4f0f643693668ea4d4 Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Sat, 7 Jan 2023 10:30:34 +0100 Subject: [PATCH 11/21] Update README. --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 093333290..5797cd20c 100644 --- a/README +++ b/README @@ -11,9 +11,9 @@ -Copyright (C) 2001 - 2021 by Joe Taylor, K1JT. +Copyright (C) 2001 - 2023 by Joe Taylor, K1JT. -WSJT-X Version 2.5 offers eleven different protocols or modes: FT4, +WSJT-X Version 2.6.1 offers eleven different protocols or modes: FT4, FT8, JT4, JT9, JT65, Q65, FST4, MSK144, WSPR, FST4W, and Echo. The first seven are designed for making reliable QSOs under weak-signal conditions. They use nearly identical message structure and source @@ -99,7 +99,7 @@ https://wsjtx.groups.io/g/main email reflector. Project web site: -https://www.physics.princeton.edu/pulsar/K1JT/wsjtx.html +https://wsjt.sourceforge.io/wsjtx.html Project mailing list (shared with other applications from the same team): From f0e387bf18f3de67ed4d15f665572e3f24eb0e15 Mon Sep 17 00:00:00 2001 From: Steven Franke <s.j.franke@icloud.com> Date: Sat, 7 Jan 2023 07:44:10 -0600 Subject: [PATCH 12/21] Replace sprintf with snprintf so that clang doesn't complain. --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 2f9d68a44..b9c612e14 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4819,9 +4819,9 @@ void MainWindow::guiUpdate() if(m_transmitting) { char s[42]; if(SpecOp::FOX==m_specOp and ui->tabWidget->currentIndex()==1) { - sprintf(s,"Tx: %d Slots",foxcom_.nslots); + snprintf(s,sizeof(s),"Tx: %d Slots",foxcom_.nslots); } else { - sprintf(s,"Tx: %s",msgsent); + snprintf(s,sizeof(s),"Tx: %s",msgsent); } m_nsendingsh=0; if(s[4]==64) m_nsendingsh=1; From 210ee2147e73f868523b1fa018b055c4256f61b2 Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Sat, 7 Jan 2023 13:17:56 -0500 Subject: [PATCH 13/21] Use snprintf in two places, replacing calls to deprecated sprintf(). --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 977946d03..55ce2dc0c 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4819,9 +4819,9 @@ void MainWindow::guiUpdate() if(m_transmitting) { char s[42]; if(SpecOp::FOX==m_specOp and ui->tabWidget->currentIndex()==1) { - sprintf(s,"Tx: %d Slots",foxcom_.nslots); + snprintf(s,sizeof(s),"Tx: %d Slots",foxcom_.nslots); } else { - sprintf(s,"Tx: %s",msgsent); + snprintf(s,sizeof(s),"Tx: %s",msgsent); } m_nsendingsh=0; if(s[4]==64) m_nsendingsh=1; From f7928f060ea86023481ac89dccba8a8ef9c5e34d Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Sat, 7 Jan 2023 13:36:18 -0500 Subject: [PATCH 14/21] Revert "Use snprintf in two places, replacing calls to deprecated sprintf()." (This had already been fixed by Steve!) This reverts commit 210ee2147e73f868523b1fa018b055c4256f61b2. --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index b9c612e14..2f9d68a44 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4819,9 +4819,9 @@ void MainWindow::guiUpdate() if(m_transmitting) { char s[42]; if(SpecOp::FOX==m_specOp and ui->tabWidget->currentIndex()==1) { - snprintf(s,sizeof(s),"Tx: %d Slots",foxcom_.nslots); + sprintf(s,"Tx: %d Slots",foxcom_.nslots); } else { - snprintf(s,sizeof(s),"Tx: %s",msgsent); + sprintf(s,"Tx: %s",msgsent); } m_nsendingsh=0; if(s[4]==64) m_nsendingsh=1; From 18ab1ce08742d4890dae91e88e9770c756b0d977 Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Sat, 7 Jan 2023 13:38:48 -0500 Subject: [PATCH 15/21] Revert "Revert "Use snprintf in two places, replacing calls to deprecated sprintf()." (This had already been fixed by Steve!)" This reverts commit f7928f060ea86023481ac89dccba8a8ef9c5e34d. --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 2f9d68a44..b9c612e14 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -4819,9 +4819,9 @@ void MainWindow::guiUpdate() if(m_transmitting) { char s[42]; if(SpecOp::FOX==m_specOp and ui->tabWidget->currentIndex()==1) { - sprintf(s,"Tx: %d Slots",foxcom_.nslots); + snprintf(s,sizeof(s),"Tx: %d Slots",foxcom_.nslots); } else { - sprintf(s,"Tx: %s",msgsent); + snprintf(s,sizeof(s),"Tx: %s",msgsent); } m_nsendingsh=0; if(s[4]==64) m_nsendingsh=1; From 1ec95a48f457b9af9be1af1042c85042a0f6dd21 Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Mon, 9 Jan 2023 10:35:51 +0100 Subject: [PATCH 16/21] Restrict this command to Windows, because it doesn't work on Linux when rig is "None". --- widgets/mainwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index b9c612e14..ffb3b0e36 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -804,7 +804,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, config_label.hide (); } statusUpdate (); +#if defined(Q_OS_WIN) QTimer::singleShot (250, [=] {setRig (m_lastMonitoredFrequency);}); // This is needed for Hamradio Deluxe +#endif }); m_multi_settings->create_menu_actions (this, ui->menuConfig); m_configurations_button = m_rigErrorMessageBox.addButton (tr ("Configurations...") From 3efea6f1f5b439e6c10d04df1eab55503fcfcfbe Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Mon, 9 Jan 2023 10:39:53 +0100 Subject: [PATCH 17/21] Re-initialize FT8 Hound mode when starting the program in this mode. --- widgets/mainwindow.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index ffb3b0e36..34a4406f6 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1039,6 +1039,12 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, } m_specOp=m_config.special_op_id(); + // Starting in FT8 Hound mode needs this initialization + if (m_specOp==SpecOp::HOUND) { + on_ft8Button_clicked(); + ui->houndButton->click(); + } + ui->labDXped->setVisible(SpecOp::NONE != m_specOp); ui->labDXped->setStyleSheet("QLabel {background-color: red; color: white;}"); ui->pbBestSP->setVisible(m_mode=="FT4"); From a7a1507b3d7c0b710d70d4c457786f8cd457494c Mon Sep 17 00:00:00 2001 From: Uwe Risse <dg2ycb@gmx.de> Date: Mon, 9 Jan 2023 11:12:06 +0100 Subject: [PATCH 18/21] Updates to the Release Notes. --- NEWS | 4 ++++ Release_Notes.txt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/NEWS b/NEWS index ab2c4a86a..5556eae42 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,10 @@ changes since release 2.6.0: - Make the initialization of the decoded text font more robust. + - Better initialization when starting the program in FT8 Hound mode. + + - Fix a compiler warning on macOS. + Release: WSJT-X 2.6.0 January 6, 2023 diff --git a/Release_Notes.txt b/Release_Notes.txt index 4556f690b..c39453c24 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -26,6 +26,10 @@ changes since release 2.6.0: - Make the initialization of the decoded text font more robust. + - Better initialization when starting the program in FT8 Hound mode. + + - Fix a compiler warning on macOS. + Release: WSJT-X 2.6.0 January 6, 2023 From ea0fb3a2d4b4a05b3d9755d3e59776a9bbdf9b60 Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Mon, 9 Jan 2023 10:33:04 -0500 Subject: [PATCH 19/21] Updated Russian translation of the UI. --- translations/wsjtx_ru.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/translations/wsjtx_ru.ts b/translations/wsjtx_ru.ts index df9cbd246..409a72a13 100644 --- a/translations/wsjtx_ru.ts +++ b/translations/wsjtx_ru.ts @@ -2545,7 +2545,7 @@ Yellow when too low</source> <message> <location filename="../widgets/mainwindow.ui" line="1377"/> <source>▲</source> - <translation></translation> + <translation type="unfinished"></translation> </message> <message> <location filename="../widgets/mainwindow.ui" line="1384"/> @@ -4050,7 +4050,7 @@ list. The list can be maintained in Settings (F2).</source> </tr> </table></source> <extracomment>Mouse commands help window contents</extracomment> - <translation><table cellpadding=5> + <translation type="unfinished"><table cellpadding=5> <tr> <th align="right">Клик на</th> <th align="left">Действие</th> @@ -4068,9 +4068,9 @@ list. The list can be maintained in Settings (F2).</source> <td><b>Двойной-клик</b> копирует второй позывной в окно Позывной DX l,<br/> локатор в QTH локатор меняет Rx и Tx частоты к<br/> частоте декодированного сигнала ,формирует стандартные сообщения.<br/> -......Если установлен флажок <b>Hold Tx Freq</b> или первый позывной в сообщении<br/> +Если установлен флажок <b>Hold Tx Freq</b> или первый позывной в сообщении<br/> является вашим собственным вызовом, частота Tx не изменяется.<br/> -......<b>Ctrl</b> удерживается.<br/> +<b>Ctrl</b> удерживается.<br/> </td> </tr> <tr> From 5e6b5b032c30f2bde67d4e4fc07c90635b8f2e58 Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Mon, 9 Jan 2023 10:48:05 -0500 Subject: [PATCH 20/21] Increase the dimension of allmessages() to max of 200. --- lib/ft8_decode.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index 4bd637e95..a19d0b83c 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -59,7 +59,7 @@ contains integer*2 iwave(15*12000) integer apsym2(58),aph10(10) character datetime*13,msg37*37 - character*37 allmessages(100) + character*37 allmessages(200) character*12 ctime integer allsnrs(100) integer itone(NN) From 8319d3633d53eb2953ad80e30efc452e3320875c Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Mon, 9 Jan 2023 11:05:45 -0500 Subject: [PATCH 21/21] Update the Release Notes. --- Release_Notes.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Release_Notes.txt b/Release_Notes.txt index c39453c24..cb790b990 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -21,15 +21,17 @@ changes since release 2.6.0: - Fix a flaw in Q65 mode that prevented proper display of the T/R period spinner. - - Correct the reference to "ARRL International Digital Contest" in the - Release Notes. - - Make the initialization of the decoded text font more robust. - Better initialization when starting the program in FT8 Hound mode. + - Fix a bug causing program crash with more than 100 decodes in a + single FT8 sequence. + - Fix a compiler warning on macOS. + - Correct the reference to "ARRL International Digital Contest" in the + Release Notes. Release: WSJT-X 2.6.0 January 6, 2023