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 @@ Click to set the Rx frequency.
Shift-click to set Tx frequency.
Ctrl-click to set Rx and Tx frequencies.
- Double-click to decode at resulting Rx frequency.
- If Lock Tx=Rx is checked all actions set Tx/Rx. + Double-click to also decode at Rx frequency.
+ If Lock Tx Freq is checked, Tx freq does not move.
Decoded text: - Double-click to copy second callsign to Dx Call,
- locator to Dx Grid; change Rx and Tx frequencies to
- decoded signal's frequency; generate standard messages.
- If first callsign is your own, Tx frequency is not
- changed unless Ctrl is held down when double-clicking.
-
- Alt-Double-click to move only Rx frequency when
- replying to a CQ or QRZ caller. + Double-click to copy second callsign to Dx Call
+ and locator to Dx Grid; change Rx frequency to decoded
+ signal's frequency; generate standard messages. Tx
+ frequency is not changed unless Ctrl is held down and
+ Lock Tx Freq is not checked.