mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 21:40:52 -05:00 
			
		
		
		
	Merge branch 'develop' into feat-fst280
This commit is contained in:
		
						commit
						92cf7b29c2
					
				@ -744,9 +744,6 @@ set (all_C_and_CXXSRCS
 | 
				
			|||||||
  )
 | 
					  )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set (TOP_LEVEL_RESOURCES
 | 
					set (TOP_LEVEL_RESOURCES
 | 
				
			||||||
  shortcuts.txt
 | 
					 | 
				
			||||||
  mouse_commands.txt
 | 
					 | 
				
			||||||
  prefixes.txt
 | 
					 | 
				
			||||||
  cty.dat
 | 
					  cty.dat
 | 
				
			||||||
  icons/Darwin/wsjtx.iconset/icon_128x128.png
 | 
					  icons/Darwin/wsjtx.iconset/icon_128x128.png
 | 
				
			||||||
  contrib/gpl-v3-logo.svg
 | 
					  contrib/gpl-v3-logo.svg
 | 
				
			||||||
@ -1846,11 +1843,11 @@ endif ()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
set (CPACK_DEBIAN_PACKAGE_DESCRIPTION "${PROJECT_DESCRIPTION}")
 | 
					set (CPACK_DEBIAN_PACKAGE_DESCRIPTION "${PROJECT_DESCRIPTION}")
 | 
				
			||||||
set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE}")
 | 
					set (CPACK_DEBIAN_PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE}")
 | 
				
			||||||
set (CPACK_DEBIAN_PACKAGE_DEPENDS "libgfortran3 (>=4.8.2), libqt5serialport5 (>=5.5), libqt5multimedia5-plugins (>=5.5), libqt5widgets5 (>=5.5), libqt5sql5-sqlite (>=5.5), libusb-1.0-0, libudev1, libc6 (>=2.19)")
 | 
					set (CPACK_DEBIAN_PACKAGE_DEPENDS "libgfortran4 (>=7.3.0), libfftw3-single3 (>=3.3.7), libgomp1 (>8), libqt5serialport5 (>=5.9.5), libqt5multimedia5-plugins (>=5.9.5), libqt5widgets5 (>=5.9.5), libqt5network5 (>=5.9.5), libqt5printsupport5 (>=5.9.5), libqt5sql5-sqlite (>=5.9.5), libusb-1.0-0 (>=1.0.21)")
 | 
				
			||||||
set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 | 
					set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set (CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 | 
					set (CPACK_RPM_PACKAGE_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 | 
				
			||||||
set (CPACK_RPM_PACKAGE_REQUIRES "qt5-qtserialport >= 5.5, qt5-qtmultimedia >= 5.5, qt5-qtsvg, libusb, systemd-udev, glibc >= 2, libgfortran >= 4.8.2")
 | 
					set (CPACK_RPM_PACKAGE_REQUIRES "qt5-qtbase >= 5.6, qt5-qtserialport >= 5.6, qt5-qtmultimedia >= 5.6, qt5-qtsvg >= 5.6, libusbx >= 1.0.23, libgfortran >= 4.7, fftw-libs-double > 3.3.8, fftw-libs-single > 3.3.8")
 | 
				
			||||||
set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/share/pixmaps /usr/share/applications /usr/share/man /usr/share/man1)
 | 
					set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/share/pixmaps /usr/share/applications /usr/share/man /usr/share/man1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
 | 
					configure_file ("${PROJECT_SOURCE_DIR}/CMakeCPackOptions.cmake.in"
 | 
				
			||||||
 | 
				
			|||||||
@ -1,31 +0,0 @@
 | 
				
			|||||||
<table cellpadding=5>
 | 
					 | 
				
			||||||
  <tr>
 | 
					 | 
				
			||||||
    <th align="right">Click on</th>
 | 
					 | 
				
			||||||
    <th align="left">Action</th>
 | 
					 | 
				
			||||||
  </tr>
 | 
					 | 
				
			||||||
  <tr>
 | 
					 | 
				
			||||||
    <td align="right">Waterfall:</td>
 | 
					 | 
				
			||||||
    <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/>
 | 
					 | 
				
			||||||
    </td>
 | 
					 | 
				
			||||||
  </tr>
 | 
					 | 
				
			||||||
  <tr>
 | 
					 | 
				
			||||||
    <td align="right">Decoded text:</td>
 | 
					 | 
				
			||||||
    <td><b>Double-click</b> to copy second callsign to Dx Call,<br/>
 | 
					 | 
				
			||||||
        locator to Dx Grid, change Rx and Tx frequency to<br/>
 | 
					 | 
				
			||||||
        decoded signal's frequency, and generate standard<br/>
 | 
					 | 
				
			||||||
	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/>
 | 
					 | 
				
			||||||
    </td>
 | 
					 | 
				
			||||||
  </tr>
 | 
					 | 
				
			||||||
  <tr>
 | 
					 | 
				
			||||||
    <td align="right">Erase button:</td>
 | 
					 | 
				
			||||||
    <td><b>Click</b> to erase QSO window.<br/>
 | 
					 | 
				
			||||||
        <b>Double-click</b> to erase QSO and Band Activity windows.
 | 
					 | 
				
			||||||
    </td>
 | 
					 | 
				
			||||||
  </tr>
 | 
					 | 
				
			||||||
</table>
 | 
					 | 
				
			||||||
							
								
								
									
										27
									
								
								prefixes.txt
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								prefixes.txt
									
									
									
									
									
								
							@ -1,27 +0,0 @@
 | 
				
			|||||||
Type 1 Prefixes:
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 1A    1S    3A    3B6   3B8   3B9   3C    3C0   3D2   3D2C  3D2R  3DA   3V    3W    3X   
 | 
					 | 
				
			||||||
 3Y    3YB   3YP   4J    4L    4S    4U1I  4U1U  4W    4X    5A    5B    5H    5N    5R   
 | 
					 | 
				
			||||||
 5T    5U    5V    5W    5X    5Z    6W    6Y    7O    7P    7Q    7X    8P    8Q    8R   
 | 
					 | 
				
			||||||
 9A    9G    9H    9J    9K    9L    9M2   9M6   9N    9Q    9U    9V    9X    9Y    A2   
 | 
					 | 
				
			||||||
 A3    A4    A5    A6    A7    A9    AP    BS7   BV    BV9   BY    C2    C3    C5    C6   
 | 
					 | 
				
			||||||
 C9    CE    CE0X  CE0Y  CE0Z  CE9   CM    CN    CP    CT    CT3   CU    CX    CY0   CY9  
 | 
					 | 
				
			||||||
 D2    D4    D6    DL    DU    E3    E4    EA    EA6   EA8   EA9   EI    EK    EL    EP   
 | 
					 | 
				
			||||||
 ER    ES    ET    EU    EX    EY    EZ    F     FG    FH    FJ    FK    FKC   FM    FO   
 | 
					 | 
				
			||||||
 FOA   FOC   FOM   FP    FR    FRG   FRJ   FRT   FT5W  FT5X  FT5Z  FW    FY    M     MD   
 | 
					 | 
				
			||||||
 MI    MJ    MM    MU    MW    H4    H40   HA    HB    HB0   HC    HC8   HH    HI    HK   
 | 
					 | 
				
			||||||
 HK0A  HK0M  HL    HM    HP    HR    HS    HV    HZ    I     IS    IS0   J2    J3    J5   
 | 
					 | 
				
			||||||
 J6    J7    J8    JA    JDM   JDO   JT    JW    JX    JY    K     KG4   KH0   KH1   KH2  
 | 
					 | 
				
			||||||
 KH3   KH4   KH5   KH5K  KH6   KH7   KH8   KH9   KL    KP1   KP2   KP4   KP5   LA    LU   
 | 
					 | 
				
			||||||
 LX    LY    LZ    OA    OD    OE    OH    OH0   OJ0   OK    OM    ON    OX    OY    OZ   
 | 
					 | 
				
			||||||
 P2    P4    PA    PJ2   PJ7   PY    PY0F  PT0S  PY0T  PZ    R1F   R1M   S0    S2    S5   
 | 
					 | 
				
			||||||
 S7    S9    SM    SP    ST    SU    SV    SVA   SV5   SV9   T2    T30   T31   T32   T33  
 | 
					 | 
				
			||||||
 T5    T7    T8    T9    TA    TF    TG    TI    TI9   TJ    TK    TL    TN    TR    TT   
 | 
					 | 
				
			||||||
 TU    TY    TZ    UA    UA2   UA9   UK    UN    UR    V2    V3    V4    V5    V6    V7   
 | 
					 | 
				
			||||||
 V8    VE    VK    VK0H  VK0M  VK9C  VK9L  VK9M  VK9N  VK9W  VK9X  VP2E  VP2M  VP2V  VP5  
 | 
					 | 
				
			||||||
 VP6   VP6D  VP8   VP8G  VP8H  VP8O  VP8S  VP9   VQ9   VR    VU    VU4   VU7   XE    XF4  
 | 
					 | 
				
			||||||
 XT    XU    XW    XX9   XZ    YA    YB    YI    YJ    YK    YL    YN    YO    YS    YU   
 | 
					 | 
				
			||||||
 YV    YV0   Z2    Z3    ZA    ZB    ZC4   ZD7   ZD8   ZD9   ZF    ZK1N  ZK1S  ZK2   ZK3  
 | 
					 | 
				
			||||||
 ZL    ZL7   ZL8   ZL9   ZP    ZS    ZS8   KC4   E5   
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Type 1 Suffixes:    /0 /1 /2 /3 /4 /5 /6 /7 /8 /9 /A /P
 | 
					 | 
				
			||||||
@ -1,45 +0,0 @@
 | 
				
			|||||||
<table cellspacing=1>
 | 
					 | 
				
			||||||
  <tr><td><b>Esc      </b></td><td>Stop Tx, abort QSO, clear next-call queue</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F1       </b></td><td>Online User's Guide (Alt: transmit Tx6)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Shift+F1  </b></td><td>Copyright Notice</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+F1  </b></td><td>About WSJT-X</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F2       </b></td><td>Open settings window (Alt: transmit Tx2)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F3       </b></td><td>Display keyboard shortcuts (Alt: transmit Tx3)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F4       </b></td><td>Clear DX Call, DX Grid, Tx messages 1-4 (Alt: transmit Tx4)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+F4   </b></td><td>Exit program</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F5       </b></td><td>Display special mouse commands (Alt: transmit Tx5)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F6       </b></td><td>Open next file in directory (Alt: toggle "Call 1st")</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F7       </b></td><td>Display Message Averaging window</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F11      </b></td><td>Move Rx frequency down 1 Hz</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+F11 </b></td><td>Move identical Rx and Tx frequencies down 1 Hz</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Shift+F11 </b></td><td>Move Tx frequency down 60 Hz (FT8) or 90 Hz (FT4)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+Shift+F11 </b></td><td>Move dial frequency down 2000 Hz</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>F12      </b></td><td>Move Rx frequency up 1 Hz</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+F12 </b></td><td>Move identical Rx and Tx frequencies up 1 Hz</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Shift+F12 </b></td><td>Move Tx frequency up 60 Hz (FT8) or 90 Hz (FT4)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+Shift+F12 </b></td><td>Move dial frequency up 2000 Hz</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+1-6  </b></td><td>Set now transmission to this number on Tab 1</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctl+1-6  </b></td><td>Set next transmission to this number on Tab 1</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+B    </b></td><td>Toggle "Best S+P" status</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+C    </b></td><td>Toggle "Call 1st" checkbox</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+D    </b></td><td>Decode again at QSO frequency</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Shift+D  </b></td><td>Full decode (both windows)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+E   </b></td><td>Turn on TX even/1st</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Shift+E  </b></td><td>Turn off TX even/1st</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+E    </b></td><td>Erase</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+F   </b></td><td>Edit the free text message box</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+G    </b></td><td>Generate standard messages</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+H    </b></td><td>Halt Tx</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+L   </b></td><td>Lookup callsign in database, generate standard messages</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+M    </b></td><td>Monitor</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+N    </b></td><td>Enable Tx</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+O   </b></td><td>Open a .wav file</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+O    </b></td><td>Change operator</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+Q    </b></td><td>Log QSO</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Ctrl+R   </b></td><td>Set Tx4 message to RRR (not in FT4)</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+R    </b></td><td>Set Tx4 message to RR73</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+S    </b></td><td>Stop monitoring</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+T    </b></td><td>Toggle Tune status</td></tr>
 | 
					 | 
				
			||||||
  <tr><td><b>Alt+Z    </b></td><td>Clear hung decoder status</td></tr>
 | 
					 | 
				
			||||||
</table>
 | 
					 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@ -3,30 +3,19 @@
 | 
				
			|||||||
#include <QApplication>
 | 
					#include <QApplication>
 | 
				
			||||||
#include <QString>
 | 
					#include <QString>
 | 
				
			||||||
#include <QPalette>
 | 
					#include <QPalette>
 | 
				
			||||||
#include <QFile>
 | 
					 | 
				
			||||||
#include <QTextStream>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "qt_helpers.hpp"
 | 
					#include "qt_helpers.hpp"
 | 
				
			||||||
#include "widgets/MessageBox.hpp"
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "moc_HelpTextWindow.cpp"
 | 
					#include "moc_HelpTextWindow.cpp"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HelpTextWindow::HelpTextWindow (QString const& title, QString const& file_name, QFont const& font, QWidget * parent)
 | 
					HelpTextWindow::HelpTextWindow (QString const& title, QString const& text, QFont const& font, QWidget * parent)
 | 
				
			||||||
  : QLabel {parent, Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint}
 | 
					  : QLabel {parent, Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint}
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  QFile source {file_name};
 | 
					 | 
				
			||||||
  if (!source.open (QIODevice::ReadOnly | QIODevice::Text))
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
      MessageBox::warning_message (this, tr ("Help file error")
 | 
					 | 
				
			||||||
                                   , tr ("Cannot open \"%1\" for reading").arg (source.fileName ())
 | 
					 | 
				
			||||||
                                   , tr ("Error: %1").arg (source.errorString ()));
 | 
					 | 
				
			||||||
      return;
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  setWindowTitle(QApplication::applicationName () + " - " + title);
 | 
					  setWindowTitle(QApplication::applicationName () + " - " + title);
 | 
				
			||||||
  setMargin (10);
 | 
					  setMargin (10);
 | 
				
			||||||
  setBackgroundRole (QPalette::Base);
 | 
					  setBackgroundRole (QPalette::Base);
 | 
				
			||||||
  setAutoFillBackground (true);
 | 
					  setAutoFillBackground (true);
 | 
				
			||||||
  setStyleSheet (font_as_stylesheet (font));
 | 
					  setStyleSheet (font_as_stylesheet (font));
 | 
				
			||||||
  setText (QTextStream {&source}.readAll ());
 | 
					  setText (text);
 | 
				
			||||||
  setMinimumSize (sizeHint ());
 | 
					  setMinimumSize (sizeHint ());
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
				
			|||||||
@ -12,7 +12,7 @@ class HelpTextWindow final
 | 
				
			|||||||
  Q_OBJECT
 | 
					  Q_OBJECT
 | 
				
			||||||
 | 
					
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
  HelpTextWindow (QString const& title, QString const& file_name, QFont const& = QFont {}, QWidget * parent = nullptr);
 | 
					  HelpTextWindow (QString const& title, QString const& text, QFont const& = QFont {}, QWidget * parent = nullptr);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
				
			|||||||
@ -2852,8 +2852,53 @@ void MainWindow::on_actionKeyboard_shortcuts_triggered()
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
      QFont font;
 | 
					      QFont font;
 | 
				
			||||||
      font.setPointSize (10);
 | 
					      font.setPointSize (10);
 | 
				
			||||||
      m_shortcuts.reset (new HelpTextWindow {tr ("Keyboard Shortcuts")
 | 
					      m_shortcuts.reset (new HelpTextWindow {tr ("Keyboard Shortcuts"),
 | 
				
			||||||
            , ":/shortcuts.txt", font});
 | 
					                                               //: Keyboard shortcuts help window contents
 | 
				
			||||||
 | 
					                                               tr (R"(<table cellspacing=1>
 | 
				
			||||||
 | 
					  <tr><td><b>Esc      </b></td><td>Stop Tx, abort QSO, clear next-call queue</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F1       </b></td><td>Online User's Guide (Alt: transmit Tx6)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Shift+F1  </b></td><td>Copyright Notice</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+F1  </b></td><td>About WSJT-X</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F2       </b></td><td>Open settings window (Alt: transmit Tx2)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F3       </b></td><td>Display keyboard shortcuts (Alt: transmit Tx3)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F4       </b></td><td>Clear DX Call, DX Grid, Tx messages 1-4 (Alt: transmit Tx4)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+F4   </b></td><td>Exit program</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F5       </b></td><td>Display special mouse commands (Alt: transmit Tx5)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F6       </b></td><td>Open next file in directory (Alt: toggle "Call 1st")</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F7       </b></td><td>Display Message Averaging window</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F11      </b></td><td>Move Rx frequency down 1 Hz</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+F11 </b></td><td>Move identical Rx and Tx frequencies down 1 Hz</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Shift+F11 </b></td><td>Move Tx frequency down 60 Hz (FT8) or 90 Hz (FT4)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+Shift+F11 </b></td><td>Move dial frequency down 2000 Hz</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>F12      </b></td><td>Move Rx frequency up 1 Hz</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+F12 </b></td><td>Move identical Rx and Tx frequencies up 1 Hz</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Shift+F12 </b></td><td>Move Tx frequency up 60 Hz (FT8) or 90 Hz (FT4)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+Shift+F12 </b></td><td>Move dial frequency up 2000 Hz</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+1-6  </b></td><td>Set now transmission to this number on Tab 1</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctl+1-6  </b></td><td>Set next transmission to this number on Tab 1</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+B    </b></td><td>Toggle "Best S+P" status</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+C    </b></td><td>Toggle "Call 1st" checkbox</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+D    </b></td><td>Decode again at QSO frequency</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Shift+D  </b></td><td>Full decode (both windows)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+E   </b></td><td>Turn on TX even/1st</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Shift+E  </b></td><td>Turn off TX even/1st</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+E    </b></td><td>Erase</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+F   </b></td><td>Edit the free text message box</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+G    </b></td><td>Generate standard messages</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+H    </b></td><td>Halt Tx</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+L   </b></td><td>Lookup callsign in database, generate standard messages</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+M    </b></td><td>Monitor</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+N    </b></td><td>Enable Tx</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+O   </b></td><td>Open a .wav file</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+O    </b></td><td>Change operator</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+Q    </b></td><td>Log QSO</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Ctrl+R   </b></td><td>Set Tx4 message to RRR (not in FT4)</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+R    </b></td><td>Set Tx4 message to RR73</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+S    </b></td><td>Stop monitoring</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+T    </b></td><td>Toggle Tune status</td></tr>
 | 
				
			||||||
 | 
					  <tr><td><b>Alt+Z    </b></td><td>Clear hung decoder status</td></tr>
 | 
				
			||||||
 | 
					</table>)"), font});
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  m_shortcuts->showNormal ();
 | 
					  m_shortcuts->showNormal ();
 | 
				
			||||||
  m_shortcuts->raise ();
 | 
					  m_shortcuts->raise ();
 | 
				
			||||||
@ -2865,8 +2910,39 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
 | 
				
			|||||||
    {
 | 
					    {
 | 
				
			||||||
      QFont font;
 | 
					      QFont font;
 | 
				
			||||||
      font.setPointSize (10);
 | 
					      font.setPointSize (10);
 | 
				
			||||||
      m_mouseCmnds.reset (new HelpTextWindow {tr ("Special Mouse Commands")
 | 
					      m_mouseCmnds.reset (new HelpTextWindow {tr ("Special Mouse Commands"),
 | 
				
			||||||
            , ":/mouse_commands.txt", font});
 | 
					                                                //: Mouse commands help window contents
 | 
				
			||||||
 | 
					                                                tr (R"(<table cellpadding=5>
 | 
				
			||||||
 | 
					  <tr>
 | 
				
			||||||
 | 
					    <th align="right">Click on</th>
 | 
				
			||||||
 | 
					    <th align="left">Action</th>
 | 
				
			||||||
 | 
					  </tr>
 | 
				
			||||||
 | 
					  <tr>
 | 
				
			||||||
 | 
					    <td align="right">Waterfall:</td>
 | 
				
			||||||
 | 
					    <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/>
 | 
				
			||||||
 | 
					    </td>
 | 
				
			||||||
 | 
					  </tr>
 | 
				
			||||||
 | 
					  <tr>
 | 
				
			||||||
 | 
					    <td align="right">Decoded text:</td>
 | 
				
			||||||
 | 
					    <td><b>Double-click</b> to copy second callsign to Dx Call,<br/>
 | 
				
			||||||
 | 
					        locator to Dx Grid, change Rx and Tx frequency to<br/>
 | 
				
			||||||
 | 
					        decoded signal's frequency, and generate standard<br/>
 | 
				
			||||||
 | 
						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/>
 | 
				
			||||||
 | 
					    </td>
 | 
				
			||||||
 | 
					  </tr>
 | 
				
			||||||
 | 
					  <tr>
 | 
				
			||||||
 | 
					    <td align="right">Erase button:</td>
 | 
				
			||||||
 | 
					    <td><b>Click</b> to erase QSO window.<br/>
 | 
				
			||||||
 | 
					        <b>Double-click</b> to erase QSO and Band Activity windows.
 | 
				
			||||||
 | 
					    </td>
 | 
				
			||||||
 | 
					  </tr>
 | 
				
			||||||
 | 
					</table>)"), font});
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  m_mouseCmnds->showNormal ();
 | 
					  m_mouseCmnds->showNormal ();
 | 
				
			||||||
  m_mouseCmnds->raise ();
 | 
					  m_mouseCmnds->raise ();
 | 
				
			||||||
@ -7404,7 +7480,34 @@ void MainWindow::on_outAttenuation_valueChanged (int a)
 | 
				
			|||||||
void MainWindow::on_actionShort_list_of_add_on_prefixes_and_suffixes_triggered()
 | 
					void MainWindow::on_actionShort_list_of_add_on_prefixes_and_suffixes_triggered()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  if (!m_prefixes) {
 | 
					  if (!m_prefixes) {
 | 
				
			||||||
    m_prefixes.reset (new HelpTextWindow {tr ("Prefixes"), ":/prefixes.txt", {"Courier", 10}});
 | 
					    m_prefixes.reset (new HelpTextWindow {tr ("Prefixes")
 | 
				
			||||||
 | 
					                                            , R"(Type 1 Prefixes:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 1A    1S    3A    3B6   3B8   3B9   3C    3C0   3D2   3D2C  3D2R  3DA   3V    3W    3X   
 | 
				
			||||||
 | 
					 3Y    3YB   3YP   4J    4L    4S    4U1I  4U1U  4W    4X    5A    5B    5H    5N    5R   
 | 
				
			||||||
 | 
					 5T    5U    5V    5W    5X    5Z    6W    6Y    7O    7P    7Q    7X    8P    8Q    8R   
 | 
				
			||||||
 | 
					 9A    9G    9H    9J    9K    9L    9M2   9M6   9N    9Q    9U    9V    9X    9Y    A2   
 | 
				
			||||||
 | 
					 A3    A4    A5    A6    A7    A9    AP    BS7   BV    BV9   BY    C2    C3    C5    C6   
 | 
				
			||||||
 | 
					 C9    CE    CE0X  CE0Y  CE0Z  CE9   CM    CN    CP    CT    CT3   CU    CX    CY0   CY9  
 | 
				
			||||||
 | 
					 D2    D4    D6    DL    DU    E3    E4    EA    EA6   EA8   EA9   EI    EK    EL    EP   
 | 
				
			||||||
 | 
					 ER    ES    ET    EU    EX    EY    EZ    F     FG    FH    FJ    FK    FKC   FM    FO   
 | 
				
			||||||
 | 
					 FOA   FOC   FOM   FP    FR    FRG   FRJ   FRT   FT5W  FT5X  FT5Z  FW    FY    M     MD   
 | 
				
			||||||
 | 
					 MI    MJ    MM    MU    MW    H4    H40   HA    HB    HB0   HC    HC8   HH    HI    HK   
 | 
				
			||||||
 | 
					 HK0A  HK0M  HL    HM    HP    HR    HS    HV    HZ    I     IS    IS0   J2    J3    J5   
 | 
				
			||||||
 | 
					 J6    J7    J8    JA    JDM   JDO   JT    JW    JX    JY    K     KG4   KH0   KH1   KH2  
 | 
				
			||||||
 | 
					 KH3   KH4   KH5   KH5K  KH6   KH7   KH8   KH9   KL    KP1   KP2   KP4   KP5   LA    LU   
 | 
				
			||||||
 | 
					 LX    LY    LZ    OA    OD    OE    OH    OH0   OJ0   OK    OM    ON    OX    OY    OZ   
 | 
				
			||||||
 | 
					 P2    P4    PA    PJ2   PJ7   PY    PY0F  PT0S  PY0T  PZ    R1F   R1M   S0    S2    S5   
 | 
				
			||||||
 | 
					 S7    S9    SM    SP    ST    SU    SV    SVA   SV5   SV9   T2    T30   T31   T32   T33  
 | 
				
			||||||
 | 
					 T5    T7    T8    T9    TA    TF    TG    TI    TI9   TJ    TK    TL    TN    TR    TT   
 | 
				
			||||||
 | 
					 TU    TY    TZ    UA    UA2   UA9   UK    UN    UR    V2    V3    V4    V5    V6    V7   
 | 
				
			||||||
 | 
					 V8    VE    VK    VK0H  VK0M  VK9C  VK9L  VK9M  VK9N  VK9W  VK9X  VP2E  VP2M  VP2V  VP5  
 | 
				
			||||||
 | 
					 VP6   VP6D  VP8   VP8G  VP8H  VP8O  VP8S  VP9   VQ9   VR    VU    VU4   VU7   XE    XF4  
 | 
				
			||||||
 | 
					 XT    XU    XW    XX9   XZ    YA    YB    YI    YJ    YK    YL    YN    YO    YS    YU   
 | 
				
			||||||
 | 
					 YV    YV0   Z2    Z3    ZA    ZB    ZC4   ZD7   ZD8   ZD9   ZF    ZK1N  ZK1S  ZK2   ZK3  
 | 
				
			||||||
 | 
					 ZL    ZL7   ZL8   ZL9   ZP    ZS    ZS8   KC4   E5   
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Type 1 Suffixes:    /0 /1 /2 /3 /4 /5 /6 /7 /8 /9 /A /P)", {"Courier", 10}});
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  m_prefixes->showNormal();
 | 
					  m_prefixes->showNormal();
 | 
				
			||||||
  m_prefixes->raise ();
 | 
					  m_prefixes->raise ();
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user