diff --git a/mainwindow.cpp b/mainwindow.cpp
index ec1b5f1ba..bf736d7a8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -765,43 +765,6 @@ void MainWindow::keyPressEvent( QKeyEvent *e ) //keyPressEvent
int n;
switch(e->key())
{
- case Qt::Key_1:
- if(e->modifiers() & Qt::AltModifier) {
- on_txb1_clicked();
- e->ignore ();
- return;
- }
- break;
- case Qt::Key_2:
- if(e->modifiers() & Qt::AltModifier) {
- on_txb2_clicked();
- return;
- }
- break;
- case Qt::Key_3:
- if(e->modifiers() & Qt::AltModifier) {
- on_txb3_clicked();
- return;
- }
- break;
- case Qt::Key_4:
- if(e->modifiers() & Qt::AltModifier) {
- on_txb4_clicked();
- return;
- }
- break;
- case Qt::Key_5:
- if(e->modifiers() & Qt::AltModifier) {
- on_txb5_clicked();
- return;
- }
- break;
- case Qt::Key_6:
- if(e->modifiers() & Qt::AltModifier) {
- on_txb6_clicked();
- return;
- }
- break;
case Qt::Key_D:
if(e->modifiers() & Qt::ShiftModifier) {
if(!m_decoderBusy) {
@@ -1846,42 +1809,42 @@ void MainWindow::on_txb1_clicked() //txb1
{
m_ntx=1;
ui->txrb1->setChecked(true);
- m_restart=true;
+ if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb2_clicked() //txb2
{
m_ntx=2;
ui->txrb2->setChecked(true);
- m_restart=true;
+ if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb3_clicked() //txb3
{
m_ntx=3;
ui->txrb3->setChecked(true);
- m_restart=true;
+ if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb4_clicked() //txb4
{
m_ntx=4;
ui->txrb4->setChecked(true);
- m_restart=true;
+ if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb5_clicked() //txb5
{
m_ntx=5;
ui->txrb5->setChecked(true);
- m_restart=true;
+ if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb6_clicked() //txb6
{
m_ntx=6;
ui->txrb6->setChecked(true);
- m_restart=true;
+ if (m_transmitting) m_restart=true;
}
void MainWindow::doubleClickOnCall2(bool shift, bool ctrl)
diff --git a/mainwindow.ui b/mainwindow.ui
index 1c02bd3d1..ec973b56b 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1271,7 +1271,10 @@ QLabel[oob="true"] {
Qt::LeftToRight
- Tx 1
+ Tx &1
+
+
+ Alt+1
@@ -1301,6 +1304,9 @@ QLabel[oob="true"] {
+
+ Ctrl+4
+
buttonGroup
@@ -1332,6 +1338,9 @@ QLabel[oob="true"] {
+
+ Ctrl+1
+
false
@@ -1366,6 +1375,9 @@ QLabel[oob="true"] {
+
+ Ctrl+3
+
buttonGroup
@@ -1408,7 +1420,10 @@ QLabel[oob="true"] {
Switch to this Tx message NOW
- Tx 3
+ Tx &3
+
+
+ Alt+3
@@ -1424,7 +1439,10 @@ QLabel[oob="true"] {
Switch to this Tx message NOW
- Tx 4
+ Tx &4
+
+
+ Alt+4
@@ -1472,7 +1490,10 @@ QLabel[oob="true"] {
Switch to this Tx message NOW
- Tx 5
+ Tx &5
+
+
+ Alt+5
@@ -1502,6 +1523,9 @@ QLabel[oob="true"] {
+
+ Ctrl+2
+
buttonGroup
@@ -1604,7 +1628,10 @@ QLabel[oob="true"] {
Switch to this Tx message NOW
- Tx 6
+ Tx &6
+
+
+ Alt+6
@@ -1620,7 +1647,10 @@ QLabel[oob="true"] {
Switch to this Tx message NOW
- Tx 2
+ Tx &2
+
+
+ Alt+2
@@ -1650,6 +1680,9 @@ QLabel[oob="true"] {
+
+ Ctrl+6
+
true
@@ -1684,6 +1717,9 @@ QLabel[oob="true"] {
+
+ Ctrl+5
+
buttonGroup
diff --git a/shortcuts.txt b/shortcuts.txt
index 1062bb1fb..8ea547406 100644
--- a/shortcuts.txt
+++ b/shortcuts.txt
@@ -1,27 +1,28 @@
-F1 Online User's Guide
-Ctrl+F1 About WSJT-X
-F2 Open configuration window
-F3 Display keyboard shortcuts
-F4 Clear DX Call, DX Grid, Tx messages 1-5
-Alt+F4 Exit program
-F5 Display special mouse commands
-F6 Open next file in directory
-Shift+F6 Decode all remaining files in directrory
-F11 Move Rx frequency down 1 Hz
-Ctrl+F11 Move Rx and Tx frequencies down 1 Hz
-F12 Move Rx frequency up 1 Hz
-Ctrl+F12 Move Rx and Tx frequencies up 1 Hz
-Alt+1-6 Set next transmission to this number on Tab 1
-Alt+D Decode again at QSO frequency
-Shift+D Full decode (both windows)
-Alt+E Erase
-Ctrl+F Edit the free text message box
-Alt+G Generate standard messages
-Alt+H Halt Tx
-Ctrl+L Lookup callsign in database, generate standard messages
-Alt+M Monitor
-Alt+N Enable Tx
-Alt+Q Log QSO
-Alt+S Stop monitoring
-Alt+T Tune
-Alt+V Save the most recently completed *.wav file
+F1 Online User's Guide
+Ctrl+F1 About WSJT-X
+F2 Open configuration window
+F3 Display keyboard shortcuts
+F4 Clear DX Call, DX Grid, Tx messages 1-5
+Alt+F4 Exit program
+F5 Display special mouse commands
+F6 Open next file in directory
+Shift+F6 Decode all remaining files in directrory
+F11 Move Rx frequency down 1 Hz
+Ctrl+F11 Move Rx and Tx frequencies down 1 Hz
+F12 Move Rx frequency up 1 Hz
+Ctrl+F12 Move Rx and Tx frequencies up 1 Hz
+Alt+1-6 Set now transmission to this number on Tab 1
+Ctl+1-6 Set next transmission to this number on Tab 1
+Alt+D Decode again at QSO frequency
+Shift+D Full decode (both windows)
+Alt+E Erase
+Ctrl+F Edit the free text message box
+Alt+G Generate standard messages
+Alt+H Halt Tx
+Ctrl+L Lookup callsign in database, generate standard messages
+Alt+M Monitor
+Alt+N Enable Tx
+Alt+Q Log QSO
+Alt+S Stop monitoring
+Alt+T Tune
+Alt+V Save the most recently completed *.wav file