mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-22 04:11:16 -05:00
Merge branch 'hotfix-2.0.0-rc4' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc4
This commit is contained in:
commit
c6a3b9a170
@ -1875,11 +1875,11 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
|
||||
return;
|
||||
}
|
||||
case Qt::Key_E:
|
||||
if(e->modifiers() & Qt::ShiftModifier) {
|
||||
if((e->modifiers() & Qt::ShiftModifier) and m_nContest<FOX) {
|
||||
ui->txFirstCheckBox->setChecked(false);
|
||||
return;
|
||||
}
|
||||
else if (e->modifiers() & Qt::ControlModifier) {
|
||||
else if((e->modifiers() & Qt::ControlModifier) and m_nContest<FOX) {
|
||||
ui->txFirstCheckBox->setChecked(true);
|
||||
return;
|
||||
}
|
||||
|
14
mainwindow.h
14
mainwindow.h
@ -518,13 +518,13 @@ private:
|
||||
m_QSOProgress; //State machine counter
|
||||
|
||||
enum {
|
||||
NONE,
|
||||
NA_VHF,
|
||||
EU_VHF,
|
||||
FIELD_DAY,
|
||||
RTTY,
|
||||
FOX,
|
||||
HOUND
|
||||
NONE, // 0
|
||||
NA_VHF, // 1
|
||||
EU_VHF, // 2
|
||||
FIELD_DAY, // 3
|
||||
RTTY, // 4
|
||||
FOX, // 5
|
||||
HOUND // 6
|
||||
} m_nContest; //Contest type
|
||||
|
||||
enum {CALL, GRID, DXCC, MULT};
|
||||
|
Loading…
Reference in New Issue
Block a user