w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-07-23 02:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into qmap

Browse Source
This commit is contained in:
Joe Taylor
2023-12-23 14:13:08 -05:00
parent d3e9f3fc5a e92d5ca1f5
commit e0078bf01e
12 changed files with 2139 additions and 1849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/about.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ CAboutDlg::CAboutDlg(QWidget *parent) :
"WSJT-X implements a number of digital modes designed for <br />"
"weak-signal Amateur Radio communication. <br /><br />"
"&copy; 2001-2023 by Joe Taylor, K1JT, Bill Somerville, G4WJS, <br />"
"&copy; 2001-2024 by Joe Taylor, K1JT, Bill Somerville, G4WJS, <br />"
"Steve Franke, K9AN, Nico Palermo, IV3NWV, <br />"
"Uwe Risse, DG2YCB, and Brian Moran, N9ADG <br /><br />"
"We gratefully acknowledge contributions from AC6SL, AE4JY,<br />"
widgets/displaytext.cpp
+11
View File
@@ -387,6 +387,17 @@ QString DisplayText::appendWorkedB4 (QString message, QString call, QString cons
countryName.replace ("European", "EU");
countryName.replace ("African", "AF");
// assign WAE entities to the correct DXCC when "Include extra WAE entities" is not selected
if (!(m_config->include_WAE_entities())) {
countryName.replace ("Bear Is.", "Svalbard");
countryName.replace ("Shetland Is.", "Scotland");
countryName.replace ("AF Italy", "Italy");
countryName.replace ("Sicily", "Italy");
countryName.replace ("Vienna Intl Ctr", "Austria");
countryName.replace ("AF Turkey", "Turkey");
countryName.replace ("EU Turkey", "Turkey");
}
extra += countryName;
}
}
widgets/mainwindow.cpp
+32 -20
View File
@@ -1110,9 +1110,9 @@ void MainWindow::not_GA_warning_message ()
MessageBox::critical_message (this,
"This is a pre-release version of WSJT-X " + version (false) + " made\n"
"available for testing purposes. By design it will\n"
"be nonfunctional after July 1, 2024.");
"be nonfunctional after September 30, 2024.");
auto now = QDateTime::currentDateTimeUtc ();
if (now >= QDateTime {{2024, 07, 1}, {23, 59, 59, 999}, Qt::UTC}) {
if (now >= QDateTime {{2024, 9, 30}, {23, 59, 59, 999}, Qt::UTC}) {
Q_EMIT finished ();
}
}
@@ -2881,7 +2881,7 @@ 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-2023 by one or more of the following authors: Joseph Taylor, "
"2001-2024 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; Uwe Risse, DG2YCB; Brian Moran, N9ADG; "
@@ -3304,7 +3304,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
<td><b>Click</b> to set Rx frequency.<br/>
<b>Shift-click</b> to set Tx frequency.<br/>
<b>Ctrl-click</b> or <b>Right-click</b> to set Rx and Tx frequencies.<br/>
<b>Double-click</b> to also decode at Rx frequency.<br/>
<b>Double-click</b> to also decode at Rx frequency.
</td>
</tr>
<tr>
@@ -3315,7 +3315,7 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
messages.<br/>
If <b>Hold Tx Freq</b> is checked or first callsign in message<br/>
is your own call, Tx frequency is not changed unless <br/>
<b>Ctrl</b> is held down.<br/>
<b>Ctrl</b> is held down.
</td>
</tr>
<tr>
@@ -3324,6 +3324,18 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
<b>Double-click</b> to erase QSO and Band Activity windows.
</td>
</tr>
<tr>
<td align="right">Q65 Button:</td>
<td><b>Click</b> to switch to Q65 Mode.<br/>
<b>Right-click</b> to switch to Q65 Pileup Mode.
</td>
</tr>
<tr>
<td align="right">JT65 Button:</td>
<td><b>Click</b> to switch to JT65 Mode.<br/>
<b>Right-click</b> to switch to JT9 Mode.
</td>
</tr>
</table>)"), font});
}
m_mouseCmnds->showNormal ();
@@ -6614,18 +6626,14 @@ void MainWindow::on_RoundRobin_currentTextChanged(QString text)
void MainWindow::mousePressEvent(QMouseEvent *event)
{
if(ui->q65Button->hasFocus() && (event->button() & Qt::RightButton)) {
m_specOp=m_config.special_op_id();
if (m_specOp==SpecOp::Q65_PILEUP) {
m_config.setSpecial_None();
ui->tx1->setEnabled(true);
ui->txb1->setEnabled(true);
} else {
m_config.setSpecial_Q65_Pileup();
}
if(ui->q65Button->hasFocus() && (event->button() & Qt::RightButton)) { // switch to Q65_Pileup mode
m_config.setSpecial_Q65_Pileup();
m_specOp=m_config.special_op_id();
on_actionQ65_triggered();
}
if(ui->jt65Button->hasFocus() && (event->button() & Qt::RightButton)) { // switch to JT9 mode
on_actionJT9_triggered();
}
}
void MainWindow::on_dxCallEntry_textChanged (QString const& call)
@@ -10800,29 +10808,33 @@ void MainWindow::on_houndButton_clicked (bool checked)
void MainWindow::on_ft8Button_clicked()
{
if(m_specOp==SpecOp::HOUND) {
if (m_specOp==SpecOp::HOUND) {
m_config.setSpecial_None();
m_specOp=m_config.special_op_id();
}
on_actionFT8_triggered();
on_actionFT8_triggered();
}
void MainWindow::on_ft4Button_clicked()
{
on_actionFT4_triggered();
on_actionFT4_triggered();
}
void MainWindow::on_msk144Button_clicked()
{
on_actionMSK144_triggered();
on_actionMSK144_triggered();
}
void MainWindow::on_q65Button_clicked()
{
on_actionQ65_triggered();
if (m_specOp==SpecOp::Q65_PILEUP) {
m_config.setSpecial_None();
m_specOp=m_config.special_op_id();
}
on_actionQ65_triggered();
}
void MainWindow::on_jt65Button_clicked()
{
on_actionJT65_triggered();
on_actionJT65_triggered();
}
widgets/mainwindow.ui
+5 -2
View File
@@ -3017,7 +3017,7 @@ QLabel[oob=&quot;true&quot;] {
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to Q65 mode. Right-click to toggle Q65 Pileup mode On/Off.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to Q65 mode.&lt;br&gt; Right-click to switch to Q65 Pileup mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Q65</string>
@@ -3038,8 +3038,11 @@ QLabel[oob=&quot;true&quot;] {
<height>16777215</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Switch to JT65 mode</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Switch to JT65 mode. &lt;br&gt;Right-click to switch to JT9 mode.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>JT65</string>