From d68933473062ba4f7b621d0d71c40ef6ecb5a5b1 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 18 May 2018 15:35:29 +0000
Subject: [PATCH] Keyboard shoirtcuts Ctrl+F11 and Ctrl+F12 should change Tx
 freq only when equal to Rx freq.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8665 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 5 +++--
 shortcuts.txt  | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index aa07a8c3a..66a2c2220 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1898,7 +1898,8 @@ void MainWindow::bumpFqso(int n)                                 //bumpFqso()
   int i;
   bool ctrl = (n>=100);
   n=n%100;
-  i=ui->RxFreqSpinBox->value ();
+  i=ui->RxFreqSpinBox->value();
+  bool bTrackTx=ui->TxFreqSpinBox->value() == i;
   if(n==11) i--;
   if(n==12) i++;
   if (ui->RxFreqSpinBox->isEnabled ()) {
@@ -1907,7 +1908,7 @@ void MainWindow::bumpFqso(int n)                                 //bumpFqso()
   if(ctrl and m_mode.startsWith ("WSPR")) {
     ui->WSPRfreqSpinBox->setValue(i);
   } else {
-    if(ctrl) {
+    if(ctrl and bTrackTx) {
       ui->TxFreqSpinBox->setValue (i);
     }
   }
diff --git a/shortcuts.txt b/shortcuts.txt
index 2acb7bf1a..61da9debf 100644
--- a/shortcuts.txt
+++ b/shortcuts.txt
@@ -11,10 +11,10 @@
   <tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr>
   <tr><td><b>F7       </b></td><td>Display Message Averaging window</td></tr>
   <tr><td><b>F11      </b></td><td>Move Rx frequency down 1 Hz</td></tr>
-  <tr><td><b>Ctrl+F11 </b></td><td>Move Rx and Tx frequencies down 1 Hz</td></tr>
+  <tr><td><b>Ctrl+F11 </b></td><td>Move identical Rx and Tx frequencies down 1 Hz</td></tr>
   <tr><td><b>Shift+F11 </b></td><td>Move Tx frequency down 60 Hz</td></tr>
   <tr><td><b>F12      </b></td><td>Move Rx frequency up 1 Hz</td></tr>
-  <tr><td><b>Ctrl+F12 </b></td><td>Move Rx and Tx frequencies up 1 Hz</td></tr>
+  <tr><td><b>Ctrl+F12 </b></td><td>Move identical Rx and Tx frequencies up 1 Hz</td></tr>
   <tr><td><b>Shift+F12 </b></td><td>Move Tx frequency up 60 Hz</td></tr>
   <tr><td><b>Alt+1-6  </b></td><td>Set now transmission to this number on Tab 1</td></tr>
   <tr><td><b>Ctl+1-6  </b></td><td>Set next transmission to this number on Tab 1</td></tr>