From a65ebafd487d4461f22d5ab000bfdb0e22751478 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 2 Jan 2017 14:22:29 +0000
Subject: [PATCH] 1. We did the experiment: users clearly prefer a "Prompt to
 log QSO" only when 73 is sent.  Revert to that well-established behavior. 2.
 Correct the logic that detects short-form RO, RRR, and 73 messages in JT65
 VHF modes and color-highlights the Tx message box.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7442 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 .../en/controls-functions-main-window.adoc        | 15 +++++++--------
 lib/chkmsg.f90                                    |  6 +++---
 mainwindow.cpp                                    |  9 ++++-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/doc/user_guide/en/controls-functions-main-window.adoc b/doc/user_guide/en/controls-functions-main-window.adoc
index 858f932e2..5b3267098 100644
--- a/doc/user_guide/en/controls-functions-main-window.adoc
+++ b/doc/user_guide/en/controls-functions-main-window.adoc
@@ -8,14 +8,13 @@ image::main-ui-controls.png[align="left",width=650,alt="Main UI Controls"]
 * *Log QSO* raises a dialog window pre-filled with known information
 about a QSO you have nearly completed.  You can edit or add to this
 information before clicking *OK* to log the QSO.  If you check *Prompt
-me to log QSO* on the *Setup* menu, the program will raise the
-confirmation screen automatically when you send a message containing
-+RRR+ or +73+.  *Start Date* and *Start Time* are set when you
-click to send the *Tx 2* or *Tx 3* message, and backed up by one or
-two sequence lengths, respectively.  (Note that the actual start time
-may have been earlier if repeats of early transmissions were
-required.)  End date and time are set when the *Log QSO* screen is
-invoked.
+me to log QSO* on the *Settings -> Reporting* tab, the program will
+raise the confirmation screen automatically when you send a message
+containing +73+.  *Start Date* and *Start Time* are set when you click
+to send the *Tx 2* or *Tx 3* message, and backed up by one or two
+sequence lengths, respectively.  (Note that the actual start time may
+have been earlier if repeats of early transmissions were required.)
+End date and time are set when the *Log QSO* screen is invoked.
 
 //.Log QSO Window
 image::log-qso.png[align="center",alt="Log QSO"]
diff --git a/lib/chkmsg.f90 b/lib/chkmsg.f90
index 72e0cccba..ad0b5a134 100644
--- a/lib/chkmsg.f90
+++ b/lib/chkmsg.f90
@@ -23,9 +23,9 @@ subroutine chkmsg(message,cok,nspecial,flip)
      endif
   endif
 
-  if(message(1:3).eq.'RO ')  nspecial=2
-  if(message(1:4).eq.'RRR ') nspecial=3
-  if(message(1:3).eq.'73 ')  nspecial=4
+  if(message.eq.'RO                    ') nspecial=2
+  if(message.eq.'RRR                   ') nspecial=3
+  if(message.eq.'73                    ') nspecial=4
 
   return
 end subroutine chkmsg
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 7b0b04f5b..86516ebb1 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -143,8 +143,7 @@ namespace
   bool message_is_73 (int type, QStringList const& msg_parts)
   {
     return type >= 0
-      && (((type < 6 || 7 == type)
-      && (msg_parts.contains ("73") or msg_parts.contains ("RRR")))
+      && (((type < 6 || 7 == type) && msg_parts.contains ("73"))
       || (type == 6 && !msg_parts.filter ("73").isEmpty ()));
   }
 
@@ -3939,10 +3938,10 @@ void MainWindow::msgtype(QString t, QLineEdit* tx)               //msgtype()
   gen65_(message,&ichk,msgsent,itone0,&itype,len1,len1);
   msgsent[22]=0;
   bool text=false;
-  bool short65=false;
+  bool shortMsg=false;
   if(itype==6) text=true;
   if(itype==7 and m_config.enable_VHF_features() and
-     (m_mode=="JT65" or m_mode=="MSK144")) short65=true;
+     m_mode=="JT65") shortMsg=true;
   if(m_mode=="MSK144" and t.mid(0,1)=="<") text=false;
   if(m_mode=="MSK144" and m_config.contestMode()) {
     int i0=t.trimmed().length()-7;
@@ -3952,7 +3951,7 @@ void MainWindow::msgtype(QString t, QLineEdit* tx)               //msgtype()
   if(text) {
     p.setColor(QPalette::Base,"#ffccff");
   } else {
-    if(short65) {
+    if(shortMsg) {
       p.setColor(QPalette::Base,"#66ffff");
     } else {
       p.setColor(QPalette::Base,Qt::white);