From 4d023aacdb0c5f365545d4afb84083ea38e93ae0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 29 Sep 2017 16:53:57 +0000
Subject: [PATCH] Update mouse_sommands.txt.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8142 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/stdmsg.f90     |  7 +++++--
 mainwindow.cpp     |  1 +
 mouse_commands.txt | 17 +++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/stdmsg.f90 b/lib/stdmsg.f90
index 86666c8f2..f93d88bb1 100644
--- a/lib/stdmsg.f90
+++ b/lib/stdmsg.f90
@@ -2,15 +2,18 @@ function stdmsg(msg0,bcontest,mygrid)
 
   use iso_c_binding, only: c_bool
   use packjt
-  character*22 msg0,msg
+  character*22 msg0,msg1,msg
   character*6 mygrid
   integer dat(12)
   logical(c_bool), value :: bcontest
   logical(c_bool) :: stdmsg
 
+  msg1=msg0
+  i0=index(msg1,' OOO ')
+  if(i0.gt.10) msg1=msg0(1:i0)
   call packmsg(msg0,dat,itype,logical(bcontest))
   call unpackmsg(dat,msg,logical(bcontest),mygrid)
-  stdmsg=(msg.eq.msg0) .and. (itype.ge.0) .and. itype.ne.6
+  stdmsg=(msg.eq.msg1) .and. (itype.ge.0) .and. itype.ne.6
 
   return
 end function stdmsg
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 90d38a572..04486fe6e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3809,6 +3809,7 @@ void MainWindow::processMessage(DecodedText const& message, bool shift, bool ctr
   }
 
   auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
+  qDebug() << "a" << is_73 << bool(message.isStandardMessage()) << !message.isStandardMessage() << nWarn;
   if (!is_73 and !message.isStandardMessage() and (nWarn==0)) {
     qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid;
     return;
diff --git a/mouse_commands.txt b/mouse_commands.txt
index 164ec66d1..1e14e865e 100644
--- a/mouse_commands.txt
+++ b/mouse_commands.txt
@@ -8,20 +8,17 @@
     <td><b>Click</b> to set the Rx frequency.<br/>
         <b>Shift-click</b> to set Tx frequency.<br/>
         <b>Ctrl-click</b> to set Rx and Tx frequencies.<br/>
-	<b>Double-click</b> to decode at resulting Rx frequency.<br/>
-        If <b>Lock Tx=Rx</b> is checked all actions set Tx/Rx.
+	<b>Double-click</b> to also decode at Rx frequency.<br/>
+        If <b>Lock Tx Freq</b> is checked, Tx freq does not move.<br/>
     </td>
   </tr>
   <tr>
     <td align="right">Decoded text:</td>
-    <td><b>Double-click</b> to copy second callsign to Dx Call,<br/>
-        locator to Dx Grid; change Rx and Tx frequencies to<br/>
-        decoded signal's frequency; generate standard messages.<br/>
-        If first callsign is your own, Tx frequency is not<br/>
-        changed unless <b>Ctrl</b> is held down when double-clicking.<br/>
-	<br/>
-	<b>Alt-Double-click</b> to move only Rx frequency when<br/>
-	replying to a CQ or QRZ caller.
+    <td><b>Double-click</b> to copy second callsign to Dx Call<br/>
+        and locator to Dx Grid; change Rx frequency to decoded<br/>
+        signal's frequency; generate standard messages. Tx<br/>
+        frequency is not changed unless <b>Ctrl</b> is held down and<br/>
+	<b>Lock Tx Freq</b> is not checked.<br/>
     </td>
   </tr>
   <tr>