w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-29 21:02:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Steve Franke 2019-04-19 15:14:14 -05:00
commit 64bd55910a
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration.ui
View File

@ -2556,7 +2556,7 @@ Right click for insert and delete options.</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &amp;quot;DX&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;ARRL RTTY Roundup and similar contests. Exchange is US state, Canadian province, or &amp;quot;DX&amp;quot;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>ARRL RTTY Roundup</string> <string>RTTY Roundup messages</string>
</property> </property>
<attribute name="buttonGroup"> <attribute name="buttonGroup">
<string notr="true">special_op_activity_button_group</string> <string notr="true">special_op_activity_button_group</string>

24
models/FrequencyList.cpp
View File

@ -60,48 +60,52 @@ namespace
{3570000, Modes::JT65, IARURegions::ALL}, // JA compatible {3570000, Modes::JT65, IARURegions::ALL}, // JA compatible
{3572000, Modes::JT9, IARURegions::ALL}, {3572000, Modes::JT9, IARURegions::ALL},
{3573000, Modes::FT8, IARURegions::ALL}, // above as below JT65 {3573000, Modes::FT8, IARURegions::ALL}, // above as below JT65 is out of DM allocation
// is out of DM allocation {3568600, Modes::WSPR, IARURegions::ALL}, // needs guard marker and lock out
{3568600, Modes::WSPR, IARURegions::ALL}, // needs guard marker {3595000, Modes::FT4, IARURegions::ALL},
// and lock out
{7038600, Modes::WSPR, IARURegions::ALL}, {7038600, Modes::WSPR, IARURegions::ALL},
{7074000, Modes::FT8, IARURegions::ALL}, {7074000, Modes::FT8, IARURegions::ALL},
{7076000, Modes::JT65, IARURegions::ALL}, {7076000, Modes::JT65, IARURegions::ALL},
{7078000, Modes::FT4, IARURegions::ALL},
{7078000, Modes::JT9, IARURegions::ALL}, {7078000, Modes::JT9, IARURegions::ALL},
{7090000, Modes::FT4, IARURegions::ALL},
{10136000, Modes::FT8, IARURegions::ALL}, {10136000, Modes::FT8, IARURegions::ALL},
{10138000, Modes::JT65, IARURegions::ALL}, {10138000, Modes::JT65, IARURegions::ALL},
{10138700, Modes::WSPR, IARURegions::ALL}, {10138700, Modes::WSPR, IARURegions::ALL},
{10140000, Modes::JT9, IARURegions::ALL}, {10140000, Modes::JT9, IARURegions::ALL},
{10140000, Modes::FT4, IARURegions::ALL},
{14095600, Modes::WSPR, IARURegions::ALL}, {14095600, Modes::WSPR, IARURegions::ALL},
{14074000, Modes::FT8, IARURegions::ALL}, {14074000, Modes::FT8, IARURegions::ALL},
{14076000, Modes::JT65, IARURegions::ALL}, {14076000, Modes::JT65, IARURegions::ALL},
{14078000, Modes::FT4, IARURegions::ALL},
{14078000, Modes::JT9, IARURegions::ALL}, {14078000, Modes::JT9, IARURegions::ALL},
{14140000, Modes::FT4, IARURegions::ALL},
{18100000, Modes::FT8, IARURegions::ALL}, {18100000, Modes::FT8, IARURegions::ALL},
{18102000, Modes::JT65, IARURegions::ALL}, {18102000, Modes::JT65, IARURegions::ALL},
{18104000, Modes::JT9, IARURegions::ALL}, {18104000, Modes::JT9, IARURegions::ALL},
{18104000, Modes::FT4, IARURegions::ALL},
{18104600, Modes::WSPR, IARURegions::ALL}, {18104600, Modes::WSPR, IARURegions::ALL},
{21074000, Modes::FT8, IARURegions::ALL}, {21074000, Modes::FT8, IARURegions::ALL},
{21076000, Modes::JT65, IARURegions::ALL}, {21076000, Modes::JT65, IARURegions::ALL},
{21078000, Modes::JT9, IARURegions::ALL}, {21078000, Modes::JT9, IARURegions::ALL},
{21094600, Modes::WSPR, IARURegions::ALL}, {21094600, Modes::WSPR, IARURegions::ALL},
{21140000, Modes::FT4, IARURegions::ALL},
{24915000, Modes::FT8, IARURegions::ALL}, {24915000, Modes::FT8, IARURegions::ALL},
{24917000, Modes::JT65, IARURegions::ALL}, {24917000, Modes::JT65, IARURegions::ALL},
{24919000, Modes::JT9, IARURegions::ALL}, {24919000, Modes::JT9, IARURegions::ALL},
{24919000, Modes::FT4, IARURegions::ALL},
{24924600, Modes::WSPR, IARURegions::ALL}, {24924600, Modes::WSPR, IARURegions::ALL},
{28074000, Modes::FT8, IARURegions::ALL}, {28074000, Modes::FT8, IARURegions::ALL},
{28076000, Modes::JT65, IARURegions::ALL}, {28076000, Modes::JT65, IARURegions::ALL},
{28078000, Modes::JT9, IARURegions::ALL}, {28078000, Modes::JT9, IARURegions::ALL},
{28124600, Modes::WSPR, IARURegions::ALL}, {28124600, Modes::WSPR, IARURegions::ALL},
{28180000, Modes::FT4, IARURegions::ALL},
{50200000, Modes::Echo, IARURegions::ALL}, {50200000, Modes::Echo, IARURegions::ALL},
{50276000, Modes::JT65, IARURegions::R2}, {50276000, Modes::JT65, IARURegions::R2},
{50276000, Modes::JT65, IARURegions::R3}, {50276000, Modes::JT65, IARURegions::R3},
@ -113,6 +117,7 @@ namespace
{50310000, Modes::JT65, IARURegions::ALL}, {50310000, Modes::JT65, IARURegions::ALL},
{50312000, Modes::JT9, IARURegions::ALL}, {50312000, Modes::JT9, IARURegions::ALL},
{50313000, Modes::FT8, IARURegions::ALL}, {50313000, Modes::FT8, IARURegions::ALL},
{50318000, Modes::FT4, IARURegions::ALL},
{50323000, Modes::FT8, IARURegions::ALL}, {50323000, Modes::FT8, IARURegions::ALL},
{70100000, Modes::FT8, IARURegions::R1}, {70100000, Modes::FT8, IARURegions::R1},
@ -123,6 +128,7 @@ namespace
{144120000, Modes::JT65, IARURegions::ALL}, {144120000, Modes::JT65, IARURegions::ALL},
{144120000, Modes::Echo, IARURegions::ALL}, {144120000, Modes::Echo, IARURegions::ALL},
{144170000, Modes::FT4, IARURegions::ALL},
{144174000, Modes::FT8, IARURegions::ALL}, {144174000, Modes::FT8, IARURegions::ALL},
{144360000, Modes::MSK144, IARURegions::R1}, {144360000, Modes::MSK144, IARURegions::R1},
{144150000, Modes::MSK144, IARURegions::R2}, {144150000, Modes::MSK144, IARURegions::R2},

4
widgets/mainwindow.cpp
View File

@ -994,9 +994,9 @@ void MainWindow::not_GA_warning_message ()
"<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. It will become nonfunctional " "available for testing purposes. It will become nonfunctional "
"after June 1, 2019."); "after June 7, 2019.");
QDateTime now=QDateTime::currentDateTime(); 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(); if(now.daysTo(timeout) < 0) Q_EMIT finished();
} }