From 8d8c4f43db1a5bfe7bc810291022584e681a75ca Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 19 Apr 2019 08:58:56 -0400 Subject: [PATCH 1/4] Change label "ARRL RTTY Roundup" to "RTTY Roundup messages". --- Configuration.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration.ui b/Configuration.ui index a576304c7..c92774d9f 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2556,7 +2556,7 @@ Right click for insert and delete options. <html><head/><body><p>ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - ARRL RTTY Roundup + RTTY Roundup rules special_op_activity_button_group From e1f054d8bfc714745803345a31bb72b291d652f0 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 19 Apr 2019 15:32:00 -0400 Subject: [PATCH 2/4] Use a slightly more generic label "RTTY Roundup messages". --- Configuration.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration.ui b/Configuration.ui index c92774d9f..36a96d66f 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2556,7 +2556,7 @@ Right click for insert and delete options. <html><head/><body><p>ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &quot;DX&quot;.</p></body></html> - RTTY Roundup rules + RTTY Roundup messages special_op_activity_button_group From 5b3a15ce0b6f966e98c7c407a7df872c0f9b020c Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 19 Apr 2019 15:41:24 -0400 Subject: [PATCH 3/4] Insert new, tentative, default dial frequencies for FT4. --- models/FrequencyList.cpp | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/models/FrequencyList.cpp b/models/FrequencyList.cpp index d080f76cf..2e0cdb45e 100644 --- a/models/FrequencyList.cpp +++ b/models/FrequencyList.cpp @@ -60,48 +60,52 @@ namespace {3570000, Modes::JT65, IARURegions::ALL}, // JA compatible {3572000, Modes::JT9, IARURegions::ALL}, - {3573000, Modes::FT8, IARURegions::ALL}, // above as below JT65 - // is out of DM allocation - {3568600, Modes::WSPR, IARURegions::ALL}, // needs guard marker - // and lock out + {3573000, Modes::FT8, IARURegions::ALL}, // above as below JT65 is out of DM allocation + {3568600, Modes::WSPR, IARURegions::ALL}, // needs guard marker and lock out + {3595000, Modes::FT4, IARURegions::ALL}, {7038600, Modes::WSPR, IARURegions::ALL}, {7074000, Modes::FT8, IARURegions::ALL}, {7076000, Modes::JT65, IARURegions::ALL}, - {7078000, Modes::FT4, IARURegions::ALL}, {7078000, Modes::JT9, IARURegions::ALL}, + {7090000, Modes::FT4, IARURegions::ALL}, {10136000, Modes::FT8, IARURegions::ALL}, {10138000, Modes::JT65, IARURegions::ALL}, {10138700, Modes::WSPR, IARURegions::ALL}, {10140000, Modes::JT9, IARURegions::ALL}, - + {10140000, Modes::FT4, IARURegions::ALL}, + {14095600, Modes::WSPR, IARURegions::ALL}, {14074000, Modes::FT8, IARURegions::ALL}, {14076000, Modes::JT65, IARURegions::ALL}, - {14078000, Modes::FT4, IARURegions::ALL}, {14078000, Modes::JT9, IARURegions::ALL}, + {14140000, Modes::FT4, IARURegions::ALL}, {18100000, Modes::FT8, IARURegions::ALL}, {18102000, Modes::JT65, IARURegions::ALL}, {18104000, Modes::JT9, IARURegions::ALL}, + {18104000, Modes::FT4, IARURegions::ALL}, {18104600, Modes::WSPR, IARURegions::ALL}, {21074000, Modes::FT8, IARURegions::ALL}, {21076000, Modes::JT65, IARURegions::ALL}, {21078000, Modes::JT9, IARURegions::ALL}, {21094600, Modes::WSPR, IARURegions::ALL}, - + {21140000, Modes::FT4, IARURegions::ALL}, + {24915000, Modes::FT8, IARURegions::ALL}, {24917000, Modes::JT65, IARURegions::ALL}, {24919000, Modes::JT9, IARURegions::ALL}, + {24919000, Modes::FT4, IARURegions::ALL}, {24924600, Modes::WSPR, IARURegions::ALL}, {28074000, Modes::FT8, IARURegions::ALL}, {28076000, Modes::JT65, IARURegions::ALL}, {28078000, Modes::JT9, IARURegions::ALL}, {28124600, Modes::WSPR, IARURegions::ALL}, - + {28180000, Modes::FT4, IARURegions::ALL}, + {50200000, Modes::Echo, IARURegions::ALL}, {50276000, Modes::JT65, IARURegions::R2}, {50276000, Modes::JT65, IARURegions::R3}, @@ -113,6 +117,7 @@ namespace {50310000, Modes::JT65, IARURegions::ALL}, {50312000, Modes::JT9, IARURegions::ALL}, {50313000, Modes::FT8, IARURegions::ALL}, + {50318000, Modes::FT4, IARURegions::ALL}, {50323000, Modes::FT8, IARURegions::ALL}, {70100000, Modes::FT8, IARURegions::R1}, @@ -123,6 +128,7 @@ namespace {144120000, Modes::JT65, IARURegions::ALL}, {144120000, Modes::Echo, IARURegions::ALL}, + {144170000, Modes::FT4, IARURegions::ALL}, {144174000, Modes::FT8, IARURegions::ALL}, {144360000, Modes::MSK144, IARURegions::R1}, {144150000, Modes::MSK144, IARURegions::R2}, From f78a9ec7dffe5a3aada1a3b7f3c4023af385faf9 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 19 Apr 2019 15:42:37 -0400 Subject: [PATCH 4/4] Insert June 7 timeout date. --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index d50520946..13910ca53 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -994,9 +994,9 @@ void MainWindow::not_GA_warning_message () "

" "This is a pre-release version of WSJT-X 2.1.0 made " "available for testing purposes. It will become nonfunctional " - "after June 1, 2019."); + "after June 7, 2019."); QDateTime now=QDateTime::currentDateTime(); - QDateTime timeout=QDateTime(QDate(2019,6,1)); + QDateTime timeout=QDateTime(QDate(2019,6,7)); if(now.daysTo(timeout) < 0) Q_EMIT finished(); }