not1mm 24.4.2__tar.gz → 24.4.4__tar.gz

{not1mm-24.4.2 → not1mm-24.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.2
+Version: 24.4.4
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -32,17 +32,17 @@ Requires-Dist: Levenshtein
 
 # Not1MM
 
-The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
+ ![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
+ 
+ The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
 
 [![PyPI](https://img.shields.io/pypi/v/not1mm)](https://pypi.org/project/not1mm/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Python: 3.10+](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
-[![Made With:PyQt5](https://img.shields.io/badge/Made%20with-PyQt5-red)](https://pypi.org/project/PyQt5/)
+[![Made With:PyQt6](https://img.shields.io/badge/Made%20with-PyQt6-blue)](https://pypi.org/project/PyQt6/)
 [![Code Maturity:Snot Nosed](https://img.shields.io/badge/Code%20Maturity-Snot%20Nosed-red)](https://xkcd.com/1695/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/not1mm)](https://pypi.org/project/not1mm/)
 
-![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
-
 - [Not1MM](#not1mm)
   - [What and why is Not1MM](#what-and-why-is-not1mm)
   - [Current state](#current-state)
@@ -177,6 +177,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-4] Added per-contest echange hint when adding new contest.
 - [24-4-2] Migrated to PyQt6. I'm sure there are broken things.
 - [24-4-1-2] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets. Refocus call field after double clicking on item in the check partial window.
 - [24-4-1] Removed some un-needed loops and widgets from the check window. Fixed docking to the left side.
@@ -207,7 +208,7 @@ noted the minimum steps needed to install not1mm.
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install -y libportaudio2 python3-pip python3-pyqt5 python3-numpy
+sudo apt install -y libportaudio2 python3-pip python3-pyqt6 python3-numpy
 pip install -U not1mm
 ```
 

{not1mm-24.4.2 → not1mm-24.4.4}/README.md

@@ -1,16 +1,16 @@
 # Not1MM
 
-The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
+ ![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
+ 
+ The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<sup>
 
 [![PyPI](https://img.shields.io/pypi/v/not1mm)](https://pypi.org/project/not1mm/)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 [![Python: 3.10+](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/)
-[![Made With:PyQt5](https://img.shields.io/badge/Made%20with-PyQt5-red)](https://pypi.org/project/PyQt5/)
+[![Made With:PyQt6](https://img.shields.io/badge/Made%20with-PyQt6-blue)](https://pypi.org/project/PyQt6/)
 [![Code Maturity:Snot Nosed](https://img.shields.io/badge/Code%20Maturity-Snot%20Nosed-red)](https://xkcd.com/1695/)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/not1mm)](https://pypi.org/project/not1mm/)
 
-![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
-
 - [Not1MM](#not1mm)
   - [What and why is Not1MM](#what-and-why-is-not1mm)
   - [Current state](#current-state)
@@ -145,6 +145,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-4] Added per-contest echange hint when adding new contest.
 - [24-4-2] Migrated to PyQt6. I'm sure there are broken things.
 - [24-4-1-2] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets. Refocus call field after double clicking on item in the check partial window.
 - [24-4-1] Removed some un-needed loops and widgets from the check window. Fixed docking to the left side.
@@ -175,7 +176,7 @@ noted the minimum steps needed to install not1mm.
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install -y libportaudio2 python3-pip python3-pyqt5 python3-numpy
+sudo apt install -y libportaudio2 python3-pip python3-pyqt6 python3-numpy
 pip install -U not1mm
 ```
 

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/__main__.py

@@ -18,7 +18,6 @@ import platform
 import re
 import socket
 
-# import subprocess
 import sys
 import threading
 import uuid
@@ -34,7 +33,7 @@ import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt
 from PyQt6.QtGui import QFontDatabase, QColorConstants
-from PyQt6.QtWidgets import QFileDialog, QDockWidget
+from PyQt6.QtWidgets import QFileDialog
 
 from not1mm.lib.about import About
 from not1mm.lib.cat_interface import CAT
@@ -1390,32 +1389,34 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def launch_log_window(self) -> None:
         """Launch the log window"""
-        if not self.log_window:
-            self.log_window = LogWindow()
-            self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
+        if self.log_window:
+            self.log_window.close()
+        self.log_window = LogWindow()
+        self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_window)
         self.log_window.show()
 
     def launch_bandmap_window(self) -> None:
         """Launch the bandmap window"""
-        if not self.bandmap_window:
-            self.bandmap_window = BandMapWindow()
-            self.addDockWidget(
-                Qt.DockWidgetArea.RightDockWidgetArea, self.bandmap_window
-            )
+        if self.bandmap_window:
+            self.bandmap_window.close()
+        self.bandmap_window = BandMapWindow()
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.bandmap_window)
         self.bandmap_window.show()
 
     def launch_check_window(self) -> None:
         """Launch the check window"""
-        if not self.check_window:
-            self.check_window = CheckWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
+        if self.check_window:
+            self.check_window.close()
+        self.check_window = CheckWindow()
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
         self.check_window.show()
 
     def launch_vfo(self) -> None:
         """Launch the VFO window"""
-        if not self.vfo_window:
-            self.vfo_window = VfoWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
+        if self.vfo_window:
+            self.vfo_window.close()
+        self.vfo_window = VfoWindow()
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.show()
 
     def clear_band_indicators(self) -> None:
@@ -2949,12 +2950,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 debug_response = f"{response}"
                 logger.debug("The Response: %s\n", debug_response)
                 if response:
-                    theirgrid = response.get("grid")
+                    theirgrid = response.get("grid", "")
                     self.contact["GridSquare"] = theirgrid
-                    _theircountry = response.get("country")
+                    _theircountry = response.get("country", "")
                     if self.station.get("GridSquare", ""):
                         heading = bearing(self.station.get("GridSquare", ""), theirgrid)
-                        kilometers = distance(self.station.get("GridSquare"), theirgrid)
+                        kilometers = distance(
+                            self.station.get("GridSquare", ""), theirgrid
+                        )
                         self.heading_distance.setText(
                             f"{theirgrid} Hdg {heading}° LP {reciprocol(heading)}° / "
                             f"distance {int(kilometers*0.621371)}mi {kilometers}km"
@@ -3178,9 +3181,9 @@ class MainWindow(QtWidgets.QMainWindow):
             )
         try:
             fsutils.openFileWithOS(fsutils.USER_DATA_PATH / macro_file)
-        except:
-            logger.exception(
-                f"Could not open file {fsutils.USER_DATA_PATH / macro_file}"
+        except FileNotFoundError | PermissionError | OSError as err:
+            logger.critical(
+                f"Could not open file {fsutils.USER_DATA_PATH / macro_file} {err}"
             )
 
     def read_cw_macros(self) -> None:
@@ -3311,18 +3314,18 @@ def install_icons() -> None:
     if sys.platform == "linux":
         os.system(
             "xdg-icon-resource install --size 32 --context apps --mode user "
-            f"{fsutils.MODULE_PATH}/data/k6gte.not1mm-32.png k6gte-not1mm"
+            f"{fsutils.APP_DATA_PATH}/k6gte.not1mm-32.png k6gte-not1mm"
         )
         os.system(
             "xdg-icon-resource install --size 64 --context apps --mode user "
-            f"{fsutils.MODULE_PATH}/data/k6gte.not1mm-64.png k6gte-not1mm"
+            f"{fsutils.APP_DATA_PATH}/k6gte.not1mm-64.png k6gte-not1mm"
         )
         os.system(
             "xdg-icon-resource install --size 128 --context apps --mode user "
-            f"{fsutils.MODULE_PATH}/data/k6gte.not1mm-128.png k6gte-not1mm"
+            f"{fsutils.APP_DATA_PATH}/k6gte.not1mm-128.png k6gte-not1mm"
         )
         os.system(
-            f"xdg-desktop-menu install {fsutils.MODULE_PATH}/data/k6gte-not1mm.desktop"
+            f"xdg-desktop-menu install {fsutils.APP_DATA_PATH}/k6gte-not1mm.desktop"
         )
 
 

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/bandmap.py

@@ -17,8 +17,8 @@ from decimal import Decimal
 from json import loads
 
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
-from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QColorConstants
+from PyQt6.QtWidgets import QDockWidget
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.multicast import Multicast
@@ -302,7 +302,7 @@ class Database:
         )
 
 
-class BandMapWindow(QtWidgets.QDockWidget):
+class BandMapWindow(QDockWidget):
     """The BandMapWindow class."""
 
     zoom = 5
@@ -321,11 +321,17 @@ class BandMapWindow(QtWidgets.QDockWidget):
     multicast_interface = None
     text_color = QtGui.QColor(45, 45, 45)
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self):
+        super().__init__()
         self._udpwatch = None
 
         uic.loadUi(fsutils.APP_DATA_PATH / "bandmap.ui", self)
+        self.setFeatures(
+            QDockWidget.DockWidgetFeature.DockWidgetMovable
+            | QDockWidget.DockWidgetFeature.DockWidgetFloatable
+            | QDockWidget.DockWidgetFeature.DockWidgetClosable
+        )
+        self.setAllowedAreas(QtCore.Qt.DockWidgetArea.AllDockWidgetAreas)
         self.settings = self.get_settings()
         self.agetime = self.clear_spot_olderSpinBox.value()
         self.clear_spot_olderSpinBox.valueChanged.connect(self.spot_aging_changed)

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/checkwindow.py

@@ -12,8 +12,7 @@ import queue
 from json import loads
 import Levenshtein
 
-from PyQt6 import QtGui, uic
-from PyQt6.QtCore import Qt
+from PyQt6 import QtGui, uic, QtCore
 from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget, QDockWidget
 from PyQt6.QtGui import QMouseEvent, QColorConstants
 
@@ -41,8 +40,8 @@ class CheckWindow(QDockWidget):
 
     masterScrollWidget: QWidget = None
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self):
+        super().__init__()
         self.load_pref()
         self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
             "current_database", "ham.db"
@@ -51,7 +50,12 @@ class CheckWindow(QDockWidget):
         self.database.current_contest = self.pref.get("contest", 0)
 
         uic.loadUi(fsutils.APP_DATA_PATH / "checkwindow.ui", self)
-
+        self.setFeatures(
+            QDockWidget.DockWidgetFeature.DockWidgetMovable
+            | QDockWidget.DockWidgetFeature.DockWidgetFloatable
+            | QDockWidget.DockWidgetFeature.DockWidgetClosable
+        )
+        self.setAllowedAreas(QtCore.Qt.DockWidgetArea.AllDockWidgetAreas)
         self.mscp = SCP(fsutils.APP_DATA_PATH)
         self._udpwatch = None
         self.udp_fifo = queue.Queue()

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/data/vfo.ui

@@ -2,6 +2,9 @@
 <ui version="4.0">
  <class>DockWidget</class>
  <widget class="QDockWidget" name="DockWidget">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -10,6 +13,14 @@
     <height>132</height>
    </rect>
   </property>
+  <property name="font">
+   <font>
+    <family>JetBrains Mono</family>
+   </font>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+  </property>
   <property name="windowTitle">
    <string>DockWidget</string>
   </property>
@@ -28,6 +39,7 @@
         <widget class="QLCDNumber" name="lcdNumber">
          <property name="font">
           <font>
+           <family>JetBrains Mono</family>
            <pointsize>25</pointsize>
           </font>
          </property>

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/lib/lookup.py

@@ -8,6 +8,7 @@ HamQTH
 import logging
 import xmltodict
 import requests
+from functools import lru_cache
 
 logger = logging.getLogger("lookup")
 
@@ -21,6 +22,7 @@ class HamDBlookup:
         self.url = "https://api.hamdb.org/"
         self.error = False
 
+    @lru_cache(maxsize=1000)
     def lookup(self, call: str) -> tuple:
         """
         Lookup a call on QRZ
@@ -172,6 +174,7 @@ class QRZlookup:
             self.session = False
             self.error = f"{exception}"
 
+    @lru_cache(maxsize=1000)
     def lookup(self, call: str) -> tuple:
         """
         Lookup a call on QRZ
@@ -202,6 +205,7 @@ class QRZlookup:
                     root = baseroot.get("QRZDatabase")
         return root.get("Callsign")
 
+    @lru_cache(maxsize=1000)
     def parse_lookup(self, query_result):
         """
         Returns gridsquare and name for a callsign looked up by qrz or hamdb.
@@ -328,6 +332,7 @@ class HamQTH:
                 self.error = session.get("error")
         logger.info("session: %s", self.session)
 
+    @lru_cache(maxsize=1000)
     def lookup(self, call: str) -> tuple:
         """
         Lookup a call on HamQTH
@@ -364,6 +369,7 @@ class HamQTH:
             the_result = self.parse_lookup(root)
         return the_result
 
+    @lru_cache(maxsize=1000)
     def parse_lookup(self, root) -> dict:
         """
         Returns gridsquare and name for a callsign

not1mm-24.4.4/not1mm/lib/new_contest.py

@@ -0,0 +1,26 @@
+"""New Contest Dialog"""
+
+import importlib
+from PyQt6 import QtWidgets, uic
+
+
+class NewContest(QtWidgets.QDialog):
+    """New Contest"""
+
+    def __init__(self, app_data_path):
+        super().__init__(None)
+        uic.loadUi(app_data_path / "new_contest.ui", self)
+        self.buttonBox.clicked.connect(self.store)
+        self.contest.currentTextChanged.connect(self.add_exchange_hint)
+
+    def store(self):
+        """dialog magic"""
+
+    def add_exchange_hint(self):
+        """add hint"""
+        contest_name = self.contest.currentText().lower().replace(" ", "_")
+        temp = importlib.import_module(f"not1mm.plugins.{contest_name}")
+        if hasattr(temp, "EXCHANGE_HINT"):
+            self.exchange.setPlaceholderText(temp.EXCHANGE_HINT)
+        else:
+            self.exchange.setPlaceholderText("")

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.2"
+__version__ = "24.4.4"

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/logwindow.py

@@ -15,7 +15,7 @@ from json import loads
 
 import math
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
-from PyQt6.QtCore import Qt, QItemSelectionModel
+from PyQt6.QtCore import QItemSelectionModel
 from PyQt6.QtWidgets import QDockWidget
 
 import not1mm.fsutils as fsutils
@@ -87,8 +87,8 @@ class LogWindow(QDockWidget):
         21: "UUID",
     }
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self):
+        super().__init__()
         self.table_loading = True
         self._udpwatch = None
         self.udp_fifo = queue.Queue()
@@ -103,6 +103,12 @@ class LogWindow(QDockWidget):
         self.database.current_contest = self.pref.get("contest", 0)
         self.contact = self.database.empty_contact
         uic.loadUi(fsutils.APP_DATA_PATH / "logwindow.ui", self)
+        self.setFeatures(
+            QDockWidget.DockWidgetFeature.DockWidgetMovable
+            | QDockWidget.DockWidgetFeature.DockWidgetFloatable
+            | QDockWidget.DockWidgetFeature.DockWidgetClosable
+        )
+        self.setAllowedAreas(QtCore.Qt.DockWidgetArea.AllDockWidgetAreas)
         self.setWindowTitle(
             f"QSO History - {self.pref.get('current_database', 'ham.db')}"
         )

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/10_10_fall_cw.py

@@ -13,6 +13,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Name + 10-10# + SPC"
+
 name = "10 10 FALL CW"
 cabrillo_name = "10-10-FALL-CW"
 mode = "CW"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/10_10_spring_cw.py

@@ -12,6 +12,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Name + 10-10# + SPC"
+
 name = "10 10 SPRING CW"
 cabrillo_name = "10-10-SPRING-CW"
 mode = "CW"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/10_10_summer_phone.py

@@ -14,6 +14,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Name + 10-10# + SPC"
+
 name = "10 10 SUMMER PHONE"
 cabrillo_name = "10-10-SUMMER-PHONE"
 mode = "SSB"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/10_10_winter_phone.py

@@ -14,6 +14,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Name + 10-10# + SPC"
+
 name = "10 10 WINTER PHONE"
 cabrillo_name = "10-10-WINTER-PHONE"
 mode = "SSB"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_10m.py

@@ -57,6 +57,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "State/Province"
+
 name = "ARRL 10M"
 mode = "BOTH"  # CW SSB BOTH RTTY
 cabrillo_name = "ARRL-10"

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_dx_cw.py

@@ -15,6 +15,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "State/Province"
+
 name = "ARRL DX CW"
 cabrillo_name = "ARRL-DX-CW"
 mode = "CW"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_dx_ssb.py

@@ -15,6 +15,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "State/Province"
+
 name = "ARRL DX SSB"
 cabrillo_name = "ARRL-DX-SSB"
 mode = "SSB"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_field_day.py

@@ -13,6 +13,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "1D ORG"
+
 name = "ARRL Field Day"
 mode = "BOTH"  # CW SSB BOTH RTTY
 cabrillo_name = "ARRL-FD"

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_rtty_ru.py

@@ -8,6 +8,8 @@ from pathlib import Path
 
 from PyQt6 import QtWidgets
 
+EXCHANGE_HINT = ""
+
 name = "ARRL RTTY Round Up"
 cabrillo_name = "ARRL-RTTY"
 mode = "BOTH"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_ss_cw.py

@@ -14,6 +14,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Prec Call Check Section"
+
 name = "ARRL Sweepstakes CW"
 cabrillo_name = "ARRL-SS-CW"
 mode = "CW"  # CW SSB BOTH RTTY
@@ -381,23 +383,19 @@ def parse_exchange(self):
     for tokens in exchange.split():
         text = ""
         numb = ""
-        print(f"'{tokens}'")
         if tokens.isdigit():
-            print(f"{tokens} is digits")
             if sn == "":
                 sn = tokens
             else:
                 ck = tokens
             continue
         elif tokens.isalpha():
-            print(f"{tokens} is alpha")
             if len(tokens) == 1:
                 prec = tokens
             else:
                 sec = tokens
             continue
         elif tokens.isalnum():
-            print("isalnum")
             if tokens[:1].isalpha():
                 print(f"{tokens} is callsign")
                 call = tokens
@@ -406,7 +404,6 @@ def parse_exchange(self):
                 if c.isalpha():
                     text = tokens[i:]
                     numb = tokens[:i]
-                    print(f"{tokens[:i]} {tokens[i:]}")
                     break
             if len(text) == 1:
                 prec = text

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_ss_phone.py

@@ -14,6 +14,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Prec Call Check Section"
+
 name = "ARRL Sweepstakes Phone"
 cabrillo_name = "ARRL-SS-SSB"
 mode = "SSB"  # CW SSB BOTH RTTY
@@ -383,30 +385,25 @@ def parse_exchange(self):
         numb = ""
         print(f"'{tokens}'")
         if tokens.isdigit():
-            print(f"{tokens} is digits")
             if sn == "":
                 sn = tokens
             else:
                 ck = tokens
             continue
         elif tokens.isalpha():
-            print(f"{tokens} is alpha")
             if len(tokens) == 1:
                 prec = tokens
             else:
                 sec = tokens
             continue
         elif tokens.isalnum():
-            print("isalnum")
             if tokens[:1].isalpha():
-                print(f"{tokens} is callsign")
                 call = tokens
                 continue
             for i, c in enumerate(tokens):
                 if c.isalpha():
                     text = tokens[i:]
                     numb = tokens[:i]
-                    print(f"{tokens[:i]} {tokens[i:]}")
                     break
             if len(text) == 1:
                 prec = text

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_vhf_jan.py

@@ -48,6 +48,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "4-character grid square"
+
 name = "ARRL VHF JAN"
 mode = "BOTH"  # CW SSB BOTH RTTY
 cabrillo_name = "ARRL-VHF-JAN"

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_vhf_jun.py

@@ -16,6 +16,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "4-character grid square"
+
 name = "ARRL VHF JUN"
 mode = "BOTH"  # CW SSB BOTH RTTY
 cabrillo_name = "ARRL-VHF-JUN"

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/arrl_vhf_sep.py

@@ -16,6 +16,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "4-character grid square"
+
 name = "ARRL VHF SEP"
 mode = "BOTH"  # CW SSB BOTH RTTY
 cabrillo_name = "ARRL-VHF-SEP"

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/canada_day.py

@@ -14,6 +14,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "Province/Territory"
+
 name = "CANADA DAY"
 cabrillo_name = "CANADA-DAY"
 mode = "BOTH"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/cq_160_cw.py

@@ -15,6 +15,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "ST/Prov or DX CQ Zone"
+
 name = "CQ 160 CW"
 cabrillo_name = "CQ-160-CW"
 mode = "CW"  # CW SSB BOTH RTTY

{not1mm-24.4.2 → not1mm-24.4.4}/not1mm/plugins/cq_160_ssb.py

@@ -15,6 +15,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+EXCHANGE_HINT = "ST/Prov or DX CQ Zone"
+
 name = "CQ 160 SSB"
 cabrillo_name = "CQ-160-SSB"
 mode = "SSB"  # CW SSB BOTH RTTY