From 32cfff9e9c4aaf68e5d45d5ceeb1d38151cbc304 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 11 Nov 2015 18:06:30 +0000
Subject: [PATCH] Change add-on prefix HK0A to HK0.  Correct a flaw in
 genStdMsgs().

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@6077 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 devsetup.ui    | 4 ++--
 libm65/pfx.f   | 2 +-
 mainwindow.cpp | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/devsetup.ui b/devsetup.ui
index 31f7708cd..05d80ec43 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QTabWidget" name="ioTabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -1461,7 +1461,7 @@
       <attribute name="title">
        <string>Si570 Control</string>
       </attribute>
-      <widget class="QWidget" name="">
+      <widget class="QWidget" name="layoutWidget">
        <property name="geometry">
         <rect>
          <x>41</x>
diff --git a/libm65/pfx.f b/libm65/pfx.f
index 685b3420e..6a83179e1 100644
--- a/libm65/pfx.f
+++ b/libm65/pfx.f
@@ -23,7 +23,7 @@
      +  'FOA  ','FOC  ','FOM  ','FP   ','FR   ','FRG  ','FRJ  ','FRT  ',
      +  'FT5W ','FT5X ','FT5Z ','FW   ','FY   ','M    ','MD   ','MI   ',
      +  'MJ   ','MM   ',        'MU   ','MW   ','H4   ','H40  ','HA   ',
-     +  'HB   ','HB0  ','HC   ','HC8  ','HH   ','HI   ','HK   ','HK0A ',
+     +  'HB   ','HB0  ','HC   ','HC8  ','HH   ','HI   ','HK   ','HK0  ',
      +  'HK0M ','HL   ','HM   ','HP   ','HR   ','HS   ','HV   ','HZ   ',
      +  'I    ','IS   ','IS0  ',        'J2   ','J3   ','J5   ','J6   ',
      +  'J7   ','J8   ','JA   ','JDM  ','JDO  ','JT   ','JW   ',        
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9f710462e..b47358464 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1745,7 +1745,8 @@ void MainWindow::genStdMsgs(QString rpt)                       //genStdMsgs()
   QString hiscall=ui->dxCallEntry->text().toUpper().trimmed();
   ui->dxCallEntry->setText(hiscall);
   QString t0=hiscall + " " + m_myCall + " ";
-  QString t=t0 + m_myGrid.mid(0,4);
+  QString t=t0;
+  if(t0.indexOf("/")<0) t=t0 + m_myGrid.mid(0,4);
   msgtype(t, ui->tx1);
   if(rpt == "") {
     t=t+" OOO";