From 8a732f40a5831e2913a57ee5037ecadbe56dd809 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 31 Jul 2018 13:18:57 -0400
Subject: [PATCH] NA_VHF now basically functional in MSK144 mode.

---
 lib/stdmsg.f90 |  2 ++
 mainwindow.cpp | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/stdmsg.f90 b/lib/stdmsg.f90
index 63b0f323f..f61935622 100644
--- a/lib/stdmsg.f90
+++ b/lib/stdmsg.f90
@@ -39,6 +39,8 @@ function stdmsg(msg0)
   msg(23:37)='               '
   stdmsg=(msg(1:22).eq.msg1(1:22)) .and. (itype.ge.0) .and. (itype.ne.6)
   if(.not.stdmsg) then
+     i0=index(msg1,'  ')
+     msg1(i0:)='                    '
      call parse77(msg1,i3,n3)
      if(i3.gt.0 .or. n3.gt.0) stdmsg=.true.
   endif
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 19aeca8cb..27026b137 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3682,7 +3682,8 @@ void MainWindow::guiUpdate()
     }
   }
 
-  if(ui->txrb1->isEnabled() and (m_mode=="FT8" or m_mode=="MSK144") and m_nContest!=NONE) {
+  if(ui->txrb1->isEnabled() and (m_mode=="FT8" or m_mode=="MSK144")
+     and m_nContest!=NONE and m_nContest!=EU_VHF) {
     //We're in a contest-like mode, don't use Tx1.
     ui->tx1->setEnabled(false);
   }
@@ -4150,7 +4151,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
   QString hisgrid;
   message.deCallAndGrid(/*out*/hiscall,hisgrid);
 
-  auto is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
+  bool is_73 = message_words.filter (QRegularExpression {"^(73|RR73)$"}).size ();
   if (!is_73 and !message.isStandardMessage() and !message.string().contains("<")) {
     qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid;
     return;
@@ -5249,8 +5250,8 @@ void MainWindow::on_actionFT8_triggered()
   if(!m_config.bFox() and !m_config.bHound()) {
     QString t0="";
     if(m_config.bGenerate77()) t0=" Tx2.0   ";
-    if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
     if(m_config.bNA_VHF_Contest()) t0+="NA VHF";
+    if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
     if(m_config.bFieldDay()) t0+="Field Day";
     if(m_config.bRTTYroundup()) t0+="RTTY";
     if(t0=="") {
@@ -5272,6 +5273,8 @@ void MainWindow::on_actionFT8_triggered()
   statusChanged();
 }
 
+
+
 void MainWindow::on_actionJT4_triggered()
 {
   m_mode="JT4";
@@ -5558,6 +5561,16 @@ void MainWindow::on_actionMSK144_triggered()
   displayWidgets(nWidgets("101111110100000000010001000010000"));
   fast_config(m_bFastMode);
   statusChanged();
+
+  QString t0="";
+  if(m_config.bNA_VHF_Contest()) t0+="NA VHF";
+  if(m_config.bEU_VHF_Contest()) t0+="EU VHF";
+  if(t0=="") {
+    ui->labDXped->setVisible(false);
+  } else {
+    ui->labDXped->setVisible(true);
+    ui->labDXped->setText(t0);
+  }
 }
 
 void MainWindow::on_actionWSPR_triggered()