From aa03aaa94a9c7acf51d3e8e4869b3f07f7eedfff Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 16 Jul 2017 15:05:53 +0000 Subject: [PATCH] Merged from trunk: ------------------------------------------------------------------------ r7850 | k1jt | 2017-07-11 20:02:46 +0100 (Tue, 11 Jul 2017) | 1 line Shift+F11/F12 should not move Rx Freq. Fixed. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7901 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 25704a81c..bacd4f955 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1710,20 +1710,22 @@ void MainWindow::keyPressEvent (QKeyEvent * e) case Qt::Key_F11: n=11; if(e->modifiers() & Qt::ControlModifier) n+=100; - bumpFqso(n); if(e->modifiers() & Qt::ShiftModifier) { int f=ui->TxFreqSpinBox->value()/50; if((ui->TxFreqSpinBox->value() % 50) == 0) f=f-1; ui->TxFreqSpinBox->setValue(50*f); + } else{ + bumpFqso(n); } return; case Qt::Key_F12: n=12; if(e->modifiers() & Qt::ControlModifier) n+=100; - bumpFqso(n); if(e->modifiers() & Qt::ShiftModifier) { int f=ui->TxFreqSpinBox->value()/50; ui->TxFreqSpinBox->setValue(50*(f+1)); + } else { + bumpFqso(n); } return; case Qt::Key_E: