RR73 as CQ fixup

package.nw/gt_roster.html

@@ -201,9 +201,6 @@
               <div>
                 <label><input type="checkbox" id="huntCont" onchange="wantedChanged(this);" /> Cont</label>
               </div>
-              <div>
-                <label><input type="checkbox" id="huntRR73" onchange="wantedChanged(this);" /> RR73</label>
-              </div>
             </div>
           </div>
 
@@ -320,7 +317,10 @@
               <div id="allOnlyNewDiv">
                 <label><input type="checkbox" id="allOnlyNew" onchange="valuesChanged();" /> Only New Calls</label>
               </div>
-
+              
+              <div>
+                <label><input type="checkbox" id="wantRR73" onchange="wantedChanged(this);" /> RR73 as CQ</label>
+              </div>
               <div>
                 <label title="No Decodes Containing...">
                   <input type="checkbox" id="noMsg" onchange="valuesChanged();" />

package.nw/lib/gt.js

@@ -6846,6 +6846,7 @@ function handleWsjtxDecode(newMessage)
   let validQTH = false;
   let CQ = false;
   let DEDX = false;
+  let RR73 = false;
   let msgDEcallsign = "";
   let msgDXcallsign = "";
   let theirQTH = "";
@@ -6928,10 +6929,9 @@ function handleWsjtxDecode(newMessage)
       msgDEcallsign = decodeWords[1];
     }
 
-    if (decodeWords[2] == "RR73" && g_callRosterWindowHandle.window.g_rosterSettings.wanted.huntRR73)
+    if (decodeWords[2] == "RR73")
     {
-      CQ = true;
+      RR73 = true;
-      msgDXcallsign = "RR73";
     }
 
     let callsign = null;
@@ -7107,6 +7107,7 @@ function handleWsjtxDecode(newMessage)
     callsign.instance = newMessage.instance;
     callsign.grid = callsign.grid.substr(0, 4);
     callsign.CQ = CQ;
+    callsign.RR73 = RR73;
 
     if (msgDXcallsign == myDEcall) callsign.qrz = true;
     else callsign.qrz = false;

package.nw/lib/roster.js

@@ -72,6 +72,7 @@ var g_defaultSettings = {
   wantMinDB: false,
   wantMinFreq: false,
   wantMaxFreq: false,
+  wantRR73: false,
   maxDT: 0.5,
   minDb: -25,
   minFreq: 0,
@@ -105,8 +106,7 @@ var g_defaultSettings = {
     huntPX: false,
     huntPOTA: false,
     huntQRZ: true,
-    huntOAMS: false,
+    huntOAMS: false
-    huntRR73: false
   },
   columns: {
     Callsign: true,
@@ -1046,6 +1046,7 @@ function valuesChanged()
   g_rosterSettings.wantMinDB = wantMinDB.checked;
   g_rosterSettings.wantMinFreq = wantMinFreq.checked;
   g_rosterSettings.wantMaxFreq = wantMaxFreq.checked;
+  g_rosterSettings.wantRR73 = wantRR73.checked;
 
   maxDTView.innerHTML = g_rosterSettings.maxDT = maxDT.value;
   minDbView.innerHTML = g_rosterSettings.minDb = minDb.value;
@@ -2031,6 +2032,7 @@ function init()
   wantMinDB.checked = g_rosterSettings.wantMinDB;
   wantMinFreq.checked = g_rosterSettings.wantMinFreq;
   wantMaxFreq.checked = g_rosterSettings.wantMaxFreq;
+  wantRR73.checked = g_rosterSettings.wantRR73;
 
   maxDTView.innerHTML = maxDT.value = g_rosterSettings.maxDT;
   minDbView.innerHTML = minDb.value = g_rosterSettings.minDb;

package.nw/lib/roster/processRosterFiltering.js

@@ -60,10 +60,21 @@ function processRosterFiltering(callRoster, rosterSettings)
       entry.tx = false;
       continue;
     }
-    if (g_rosterSettings.cqOnly == true && callObj.CQ == false)
+    if (g_rosterSettings.cqOnly == true)
     {
-      entry.tx = false;
+      if (g_rosterSettings.wantRR73)
-      continue;
+      {
+        if (callObj.RR73 == false && callObj.CQ == false)
+        {
+          entry.tx = false;
+          continue;
+        }
+      }
+      else if (callObj.CQ == false)
+      {
+        entry.tx = false;
+        continue;
+      }
     }
     if (g_rosterSettings.useRegex && g_rosterSettings.callsignRegex.length > 0)
     {

package.nw/lib/roster/processRosterHunting.js

@@ -784,12 +784,12 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker)
         callingBg = "#0000FF" + inversionAlpha;
         calling = "#FFFF00;text-shadow: 0px 0px 2px #FFFF00";
       }
-      else if (callObj.CQ == true && !g_rosterSettings.cqOnly)
+      else if ((callObj.CQ == true || (g_rosterSettings.wantRR73 && callObj.RR73 == true)) && !g_rosterSettings.cqOnly)
       {
         callingBg = calling + inversionAlpha;
         calling = bold;
         // If treating RR73/73 as CQ, soften highlighting to help differentiate foreshadow from an actual CQ
-        if (callObj.DXcall == "RR73" || callObj.DXcall == "73")
+        if (g_rosterSettings.wantRR73 && callObj.RR73 == true)
         {
           callingConf = `${unconf}#90EE90${inversionAlpha};`;
           calling = `#90EE90${inversionAlpha};`

package.nw/lib/roster/rosterColumns.js

@@ -104,7 +104,7 @@ const ROSTER_COLUMNS = {
     tableData: (callObj) => ({
       rawAttrs: callObj.style.calling,
       name: callObj.CQ ? "CQ" : "Calling",
-      html: callObj.DXcall.formatCallsign()
+      html: (g_rosterSettings.wantRR73 && callObj.RR73) ? "RR73" : callObj.DXcall.formatCallsign()
     })
   },