w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-15 08:31:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix-2.0.0-rc4' of bitbucket.org:k1jt/wsjtx into hotfix-2.0.0-rc4

Browse Source
This commit is contained in:
Bill Somerville 2018-10-23 19:07:42 +01:00
commit c6a3b9a170
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mainwindow.cpp
View File

@ -1875,11 +1875,11 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return; return;
} }
case Qt::Key_E: case Qt::Key_E:
if(e->modifiers() & Qt::ShiftModifier) { if((e->modifiers() & Qt::ShiftModifier) and m_nContest<FOX) {
ui->txFirstCheckBox->setChecked(false); ui->txFirstCheckBox->setChecked(false);
return; return;
} }
else if (e->modifiers() & Qt::ControlModifier) { else if((e->modifiers() & Qt::ControlModifier) and m_nContest<FOX) {
ui->txFirstCheckBox->setChecked(true); ui->txFirstCheckBox->setChecked(true);
return; return;
} }

14
mainwindow.h
View File

@ -518,13 +518,13 @@ private:
m_QSOProgress; //State machine counter m_QSOProgress; //State machine counter
enum { enum {
NONE, NONE, // 0
NA_VHF, NA_VHF, // 1
EU_VHF, EU_VHF, // 2
FIELD_DAY, FIELD_DAY, // 3
RTTY, RTTY, // 4
FOX, FOX, // 5
HOUND HOUND // 6
} m_nContest; //Contest type } m_nContest; //Contest type
enum {CALL, GRID, DXCC, MULT}; enum {CALL, GRID, DXCC, MULT};