mirror of https://github.com/saitohirga/WSJT-X.git
Merge branch 'hotfix-2.0.0-rc4' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc4
This commit is contained in:
commit
0df09b1d2d
|
@ -1811,9 +1811,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case Qt::Key_Escape:
|
|
||||||
on_stopTxButton_clicked();
|
|
||||||
return;
|
|
||||||
case Qt::Key_F1:
|
case Qt::Key_F1:
|
||||||
on_actionOnline_User_Guide_triggered();
|
on_actionOnline_User_Guide_triggered();
|
||||||
return;
|
return;
|
||||||
|
@ -1867,11 +1864,13 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
case Qt::Key_A:
|
case Qt::Key_Escape:
|
||||||
if(e->modifiers() & Qt::ControlModifier) {
|
m_nextCall="";
|
||||||
abortQSO();
|
ui->labNextCall->setStyleSheet("");
|
||||||
return;
|
ui->labNextCall->setText("");
|
||||||
}
|
on_stopTxButton_clicked();
|
||||||
|
abortQSO();
|
||||||
|
return;
|
||||||
case Qt::Key_X:
|
case Qt::Key_X:
|
||||||
if(e->modifiers() & Qt::AltModifier) {
|
if(e->modifiers() & Qt::AltModifier) {
|
||||||
foxTest();
|
foxTest();
|
||||||
|
|
Loading…
Reference in New Issue