Improved next and current Tx message widget short cuts

Short cut  keys implemented via a  special key press event  handler do
not  fully  integrate  with  the UI  and  standard  UI  implementation
guidelines,  also they  introduce an  alternative code  path that  can
diverge from the intended behaviour.

Short  cuts   to  set  the  next   Tx  message  have  been   added  as
Ctrl+<number>.  Alt+<number>  short cuts  now do  as the  help implies
i.e. change  the current Tx message  even if there is  another message
being transmitted.

The log QSO  window should only be  triggered by a 73  Tx message when
transmitting.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4992 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

mainwindow.cpp

@@ -765,43 +765,6 @@ void MainWindow::keyPressEvent( QKeyEvent *e )                //keyPressEvent
   int n;
   switch(e->key())
     {
-    case Qt::Key_1:
-      if(e->modifiers() & Qt::AltModifier) {
-        on_txb1_clicked();
-        e->ignore ();
-        return;
-      }
-      break;
-    case Qt::Key_2:
-      if(e->modifiers() & Qt::AltModifier) {
-        on_txb2_clicked();
-        return;
-      }
-      break;
-    case Qt::Key_3:
-      if(e->modifiers() & Qt::AltModifier) {
-        on_txb3_clicked();
-        return;
-      }
-      break;
-    case Qt::Key_4:
-      if(e->modifiers() & Qt::AltModifier) {
-        on_txb4_clicked();
-        return;
-      }
-      break;
-    case Qt::Key_5:
-      if(e->modifiers() & Qt::AltModifier) {
-        on_txb5_clicked();
-        return;
-      }
-      break;
-    case Qt::Key_6:
-      if(e->modifiers() & Qt::AltModifier) {
-        on_txb6_clicked();
-        return;
-      }
-      break;
     case Qt::Key_D:
       if(e->modifiers() & Qt::ShiftModifier) {
         if(!m_decoderBusy) {
@@ -1846,42 +1809,42 @@ void MainWindow::on_txb1_clicked()                                //txb1
 {
   m_ntx=1;
   ui->txrb1->setChecked(true);
-  m_restart=true;
+  if (m_transmitting) m_restart=true;
 }
 
 void MainWindow::on_txb2_clicked()                                //txb2
 {
   m_ntx=2;
   ui->txrb2->setChecked(true);
-  m_restart=true;
+  if (m_transmitting) m_restart=true;
 }
 
 void MainWindow::on_txb3_clicked()                                //txb3
 {
   m_ntx=3;
   ui->txrb3->setChecked(true);
-  m_restart=true;
+  if (m_transmitting) m_restart=true;
 }
 
 void MainWindow::on_txb4_clicked()                                //txb4
 {
   m_ntx=4;
   ui->txrb4->setChecked(true);
-  m_restart=true;
+  if (m_transmitting) m_restart=true;
 }
 
 void MainWindow::on_txb5_clicked()                                //txb5
 {
   m_ntx=5;
   ui->txrb5->setChecked(true);
-  m_restart=true;
+  if (m_transmitting) m_restart=true;
 }
 
 void MainWindow::on_txb6_clicked()                                //txb6
 {
   m_ntx=6;
   ui->txrb6->setChecked(true);
-  m_restart=true;
+  if (m_transmitting) m_restart=true;
 }
 
 void MainWindow::doubleClickOnCall2(bool shift, bool ctrl)

mainwindow.ui

@@ -1271,7 +1271,10 @@ QLabel[oob="true"] {
                   <enum>Qt::LeftToRight</enum>
                  </property>
                  <property name="text">
-                  <string>Tx 1</string>
+                  <string>Tx &amp;1</string>
+                 </property>
+                 <property name="shortcut">
+                  <string>Alt+1</string>
                  </property>
                 </widget>
                </item>
@@ -1301,6 +1304,9 @@ QLabel[oob=&quot;true&quot;] {
                  <property name="text">
                   <string/>
                  </property>
+                 <property name="shortcut">
+                  <string>Ctrl+4</string>
+                 </property>
                  <attribute name="buttonGroup">
                   <string notr="true">buttonGroup</string>
                  </attribute>
@@ -1332,6 +1338,9 @@ QLabel[oob=&quot;true&quot;] {
                  <property name="text">
                   <string/>
                  </property>
+                 <property name="shortcut">
+                  <string>Ctrl+1</string>
+                 </property>
                  <property name="checked">
                   <bool>false</bool>
                  </property>
@@ -1366,6 +1375,9 @@ QLabel[oob=&quot;true&quot;] {
                  <property name="text">
                   <string/>
                  </property>
+                 <property name="shortcut">
+                  <string>Ctrl+3</string>
+                 </property>
                  <attribute name="buttonGroup">
                   <string notr="true">buttonGroup</string>
                  </attribute>
@@ -1408,7 +1420,10 @@ QLabel[oob=&quot;true&quot;] {
                   <string>Switch to this Tx message NOW</string>
                  </property>
                  <property name="text">
-                  <string>Tx 3</string>
+                  <string>Tx &amp;3</string>
+                 </property>
+                 <property name="shortcut">
+                  <string>Alt+3</string>
                  </property>
                 </widget>
                </item>
@@ -1424,7 +1439,10 @@ QLabel[oob=&quot;true&quot;] {
                   <string>Switch to this Tx message NOW</string>
                  </property>
                  <property name="text">
-                  <string>Tx 4</string>
+                  <string>Tx &amp;4</string>
+                 </property>
+                 <property name="shortcut">
+                  <string>Alt+4</string>
                  </property>
                 </widget>
                </item>
@@ -1472,7 +1490,10 @@ QLabel[oob=&quot;true&quot;] {
                   <string>Switch to this Tx message NOW</string>
                  </property>
                  <property name="text">
-                  <string>Tx 5</string>
+                  <string>Tx &amp;5</string>
+                 </property>
+                 <property name="shortcut">
+                  <string>Alt+5</string>
                  </property>
                 </widget>
                </item>
@@ -1502,6 +1523,9 @@ QLabel[oob=&quot;true&quot;] {
                  <property name="text">
                   <string/>
                  </property>
+                 <property name="shortcut">
+                  <string>Ctrl+2</string>
+                 </property>
                  <attribute name="buttonGroup">
                   <string notr="true">buttonGroup</string>
                  </attribute>
@@ -1604,7 +1628,10 @@ QLabel[oob=&quot;true&quot;] {
                   <string>Switch to this Tx message NOW</string>
                  </property>
                  <property name="text">
-                  <string>Tx 6</string>
+                  <string>Tx &amp;6</string>
+                 </property>
+                 <property name="shortcut">
+                  <string>Alt+6</string>
                  </property>
                 </widget>
                </item>
@@ -1620,7 +1647,10 @@ QLabel[oob=&quot;true&quot;] {
                   <string>Switch to this Tx message NOW</string>
                  </property>
                  <property name="text">
-                  <string>Tx 2</string>
+                  <string>Tx &amp;2</string>
+                 </property>
+                 <property name="shortcut">
+                  <string>Alt+2</string>
                  </property>
                 </widget>
                </item>
@@ -1650,6 +1680,9 @@ QLabel[oob=&quot;true&quot;] {
                  <property name="text">
                   <string/>
                  </property>
+                 <property name="shortcut">
+                  <string>Ctrl+6</string>
+                 </property>
                  <property name="checked">
                   <bool>true</bool>
                  </property>
@@ -1684,6 +1717,9 @@ QLabel[oob=&quot;true&quot;] {
                  <property name="text">
                   <string/>
                  </property>
+                 <property name="shortcut">
+                  <string>Ctrl+5</string>
+                 </property>
                  <attribute name="buttonGroup">
                   <string notr="true">buttonGroup</string>
                  </attribute>

shortcuts.txt

@@ -11,7 +11,8 @@ F11	Move Rx frequency down 1 Hz
 Ctrl+F11     	Move Rx and Tx frequencies down 1 Hz
 F12	Move Rx frequency up 1 Hz
 Ctrl+F12     	Move Rx and Tx frequencies up 1 Hz
-Alt+1-6	Set next transmission to this number on Tab 1
+Alt+1-6	Set now transmission to this number on Tab 1
+Ctl+1-6	Set next transmission to this number on Tab 1
 Alt+D	Decode again at QSO frequency
 Shift+D	Full decode (both windows)
 Alt+E	Erase