not1mm 25.5.14__tar.gz → 25.5.22__tar.gz

{not1mm-25.5.14 → not1mm-25.5.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.5.14
+Version: 25.5.22
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -62,6 +62,7 @@ Dynamic: license-file
   - [Flatpak](#flatpak)
   - [Installation](#installation)
     - [Prerequisites](#prerequisites)
+    - [The Easy and Fast way to always run the latest version](#the-easy-and-fast-way-to-always-run-the-latest-version)
     - [Common Installation Recipes for Ubuntu and Fedora](#common-installation-recipes-for-ubuntu-and-fedora)
       - [Ubuntu 22.04 LTS](#ubuntu-2204-lts)
       - [Ubuntu 23.04](#ubuntu-2304)
@@ -256,6 +257,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-5-22] Trap possible ValueError exception in settings.py
+-[25-5-21] Fix crash from unsafe dict key access when processing F1-F12.
 - [25-5-6] Merged PR from @JG3LLB, Koji-Kawano, Adding code to stop sending morse if using rigctld to send, and @alduhoo adding more control to CW serial number padding.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -280,6 +283,40 @@ Not1MM requires:
 
 You should install these through your distribution's package manager before continuing.
 
+### The Easy and Fast way to always run the latest version
+
+- Step 1. Visit [Astral](https://docs.astral.sh/uv/) and install uv.
+
+In short you run this in your terminal:
+
+```bash
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+- Step 2. Tell it to run not1mm:
+
+```bash
+uv tool run not1mm
+```
+
+That's it... It will go out, fetch the latest version of not1mm, setup a python virtual environment, get all the needed python libraries, cache everything and run not1mm. The first time takes a minute, but each time after, it's lightning quick and it will automatically check for updates and run the latest version.
+
+But wait... There's more. If your distro is old and you're stuck with an older version of python... Say 3.10. And you want to see what all the cool kids are using. But you don't want to corrupt your broke ol' system by downloading the newest Python version. No problem. You can tell uv to run not1mm with any version of Python you'd like. Let's say 3.14.
+
+```bash
+uv tool run --python 3.14 not1mm
+```
+
+It'll download Python 3.14 into you virtual environment and run not1mm.
+
+Let's say I was an idiot and pushed a new version and did't fully test it. This happens a-lot... We test in production. Or lets say you just want to see the pain that was back in 2023. No problem.
+
+```bash
+uv tool run --python 3.10 not1mm==23.5.19
+```
+
+Pow! Enjoy the pain... If uv is not your cuppa, you can follow the more traditional route below.
+
 ### Common Installation Recipes for Ubuntu and Fedora
 
 I've taken the time to install some common Linux distributions into a VM and
@@ -381,7 +418,7 @@ all the details from:
 In short, You should install stuff into a Python virtual environment. Newer
 Linux distros will make you do this unless you include a command line argument
 akin to '--break-my-system' when using pip. I'm not telling you to use pipx.
-But... **Use pipx**.
+But... **Use pipx**. Or better visit the [section above](#the-easy-and-fast-way-to-always-run-the-latest-version) on using uv.
 
 #### Bootstrapping pipx
 

{not1mm-25.5.14 → not1mm-25.5.22}/README.md

@@ -30,6 +30,7 @@
   - [Flatpak](#flatpak)
   - [Installation](#installation)
     - [Prerequisites](#prerequisites)
+    - [The Easy and Fast way to always run the latest version](#the-easy-and-fast-way-to-always-run-the-latest-version)
     - [Common Installation Recipes for Ubuntu and Fedora](#common-installation-recipes-for-ubuntu-and-fedora)
       - [Ubuntu 22.04 LTS](#ubuntu-2204-lts)
       - [Ubuntu 23.04](#ubuntu-2304)
@@ -224,6 +225,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-5-22] Trap possible ValueError exception in settings.py
+-[25-5-21] Fix crash from unsafe dict key access when processing F1-F12.
 - [25-5-6] Merged PR from @JG3LLB, Koji-Kawano, Adding code to stop sending morse if using rigctld to send, and @alduhoo adding more control to CW serial number padding.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
@@ -248,6 +251,40 @@ Not1MM requires:
 
 You should install these through your distribution's package manager before continuing.
 
+### The Easy and Fast way to always run the latest version
+
+- Step 1. Visit [Astral](https://docs.astral.sh/uv/) and install uv.
+
+In short you run this in your terminal:
+
+```bash
+curl -LsSf https://astral.sh/uv/install.sh | sh
+```
+
+- Step 2. Tell it to run not1mm:
+
+```bash
+uv tool run not1mm
+```
+
+That's it... It will go out, fetch the latest version of not1mm, setup a python virtual environment, get all the needed python libraries, cache everything and run not1mm. The first time takes a minute, but each time after, it's lightning quick and it will automatically check for updates and run the latest version.
+
+But wait... There's more. If your distro is old and you're stuck with an older version of python... Say 3.10. And you want to see what all the cool kids are using. But you don't want to corrupt your broke ol' system by downloading the newest Python version. No problem. You can tell uv to run not1mm with any version of Python you'd like. Let's say 3.14.
+
+```bash
+uv tool run --python 3.14 not1mm
+```
+
+It'll download Python 3.14 into you virtual environment and run not1mm.
+
+Let's say I was an idiot and pushed a new version and did't fully test it. This happens a-lot... We test in production. Or lets say you just want to see the pain that was back in 2023. No problem.
+
+```bash
+uv tool run --python 3.10 not1mm==23.5.19
+```
+
+Pow! Enjoy the pain... If uv is not your cuppa, you can follow the more traditional route below.
+
 ### Common Installation Recipes for Ubuntu and Fedora
 
 I've taken the time to install some common Linux distributions into a VM and
@@ -349,7 +386,7 @@ all the details from:
 In short, You should install stuff into a Python virtual environment. Newer
 Linux distros will make you do this unless you include a command line argument
 akin to '--break-my-system' when using pip. I'm not telling you to use pipx.
-But... **Use pipx**.
+But... **Use pipx**. Or better visit the [section above](#the-easy-and-fast-way-to-always-run-the-latest-version) on using uv.
 
 #### Bootstrapping pipx
 

{not1mm-25.5.14 → not1mm-25.5.22}/not1mm/__main__.py

@@ -30,7 +30,7 @@ import notctyparser
 
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
 from PyQt6.QtCore import QDir, Qt, QThread, QSettings, QCoreApplication
-from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap
+from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor, QPixmap, QFont
 from PyQt6.QtWidgets import QFileDialog, QSplashScreen, QApplication
 from PyQt6.QtCore import QT_VERSION_STR, PYQT_VERSION_STR
 
@@ -212,7 +212,45 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.setCorner(Qt.Corner.TopLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
         self.setCorner(Qt.Corner.BottomLeftCorner, Qt.DockWidgetArea.LeftDockWidgetArea)
+        self.fontfamily = self.load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
         uic.loadUi(fsutils.APP_DATA_PATH / "main.ui", self)
+        if sys.platform == "darwin":
+            def_font_size = 12
+
+            QApplication.instance().setFont(QFont(self.fontfamily, def_font_size))
+            self.F1.setFont(QFont(self.fontfamily, def_font_size))
+            self.F2.setFont(QFont(self.fontfamily, def_font_size))
+            self.F3.setFont(QFont(self.fontfamily, def_font_size))
+            self.F4.setFont(QFont(self.fontfamily, def_font_size))
+            self.F5.setFont(QFont(self.fontfamily, def_font_size))
+            self.F6.setFont(QFont(self.fontfamily, def_font_size))
+            self.F7.setFont(QFont(self.fontfamily, def_font_size))
+            self.F8.setFont(QFont(self.fontfamily, def_font_size))
+            self.F9.setFont(QFont(self.fontfamily, def_font_size))
+            self.F10.setFont(QFont(self.fontfamily, def_font_size))
+            self.F11.setFont(QFont(self.fontfamily, def_font_size))
+            self.F12.setFont(QFont(self.fontfamily, def_font_size))
+            self.radioButton_run.setFont(QFont(self.fontfamily, def_font_size))
+            self.radioButton_sp.setFont(QFont(self.fontfamily, def_font_size))
+            self.cw_speed.setFont(QFont(self.fontfamily, def_font_size))
+            self.callsign_label.setFont(QFont(self.fontfamily, def_font_size))
+            self.snt_label.setFont(QFont(self.fontfamily, def_font_size))
+            self.rcv_label.setFont(QFont(self.fontfamily, def_font_size))
+            self.other_label.setFont(QFont(self.fontfamily, def_font_size))
+            self.exch_label.setFont(QFont(self.fontfamily, def_font_size))
+            self.heading_distance.setFont(QFont(self.fontfamily, def_font_size))
+            self.history_info.setFont(QFont(self.fontfamily, def_font_size))
+            self.dx_entity.setFont(QFont(self.fontfamily, def_font_size))
+            self.score.setFont(QFont(self.fontfamily, def_font_size))
+            self.mults.setFont(QFont(self.fontfamily, def_font_size))
+
+            self.callsign.setFont(QFont(self.fontfamily, 20))
+            self.sent.setFont(QFont(self.fontfamily, 20))
+            self.receive.setFont(QFont(self.fontfamily, 20))
+            self.other_1.setFont(QFont(self.fontfamily, 20))
+            self.other_2.setFont(QFont(self.fontfamily, 20))
+            self.dupe_indicator.setFont(QFont(self.fontfamily, 20))
+
         self.history_info.hide()
         QApplication.instance().focusObjectChanged.connect(self.on_focus_changed)
         QApplication.instance().styleHints().colorSchemeChanged.connect(
@@ -1990,11 +2028,11 @@ class MainWindow(QtWidgets.QMainWindow):
                 indicator.setFrameShape(QtWidgets.QFrame.Shape.NoFrame)
                 if self.text_color == QColorConstants.Black:
                     indicator.setStyleSheet(
-                        "font-family: JetBrains Mono ExtraLight; color: black;"
+                        f"font-family: {self.fontfamily}; color: black;"
                     )
                 else:
                     indicator.setStyleSheet(
-                        "font-family: JetBrains Mono ExtraLight; color: white"
+                        f"font-family: {self.fontfamily}; color: white;"
                     )
 
     def set_band_indicator(self, band: str) -> None:
@@ -2017,7 +2055,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if indicator:
                 indicator.setFrameShape(QtWidgets.QFrame.Shape.Box)
                 indicator.setStyleSheet(
-                    "font-family: JetBrains Mono ExtraLight; color: green;"
+                    f"font-family: {self.fontfamily}; color: green;"
                 )
 
     def closeEvent(self, _event) -> None:
@@ -2872,7 +2910,13 @@ class MainWindow(QtWidgets.QMainWindow):
             next_serial = "1"
         macro = macro.upper()
         if self.radio_state.get("mode") == "CW":
-            macro = macro.replace("#", next_serial.rjust(self.pref["cwpaddinglength"], self.pref["cwpaddingchar"]))
+            macro = macro.replace(
+                "#",
+                next_serial.rjust(
+                    self.pref.get("cwpaddinglength", 3),
+                    self.pref.get("cwpaddingchar", "T"),
+                ),
+            )
         else:
             macro = macro.replace("#", next_serial)
         macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
@@ -2885,7 +2929,13 @@ class MainWindow(QtWidgets.QMainWindow):
             macro = macro.replace("{SNT}", self.sent.text())
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace(
-                "{SENTNR}", self.other_1.text().lstrip("0").rjust(self.pref["cwpaddinglength"], self.pref["cwpaddingchar"])
+                "{SENTNR}",
+                self.other_1.text()
+                .lstrip("0")
+                .rjust(
+                    self.pref.get("cwpaddinglength", 3),
+                    self.pref.get("cwpaddingchar", "T"),
+                ),
             )
         else:
             macro = macro.replace("{SENTNR}", self.other_1.text())
@@ -4177,26 +4227,26 @@ class MainWindow(QtWidgets.QMainWindow):
         logger.debug("******Cabrillo*****")
         self.contest.cabrillo(self, file_encoding)
 
+    def load_fonts_from_dir(self, directory: str) -> str:
+        """
+        Well it loads fonts from a directory...
 
-def load_fonts_from_dir(directory: str) -> set:
-    """
-    Well it loads fonts from a directory...
-
-    Parameters
-    ----------
-    directory : str
-    The directory to load fonts from.
+        Parameters
+        ----------
+        directory : str
+        The directory to load fonts from.
 
-    Returns
-    -------
-    set
-    A set of font families installed in the directory.
-    """
-    font_families = set()
-    for _fi in QDir(directory).entryInfoList(["*.ttf", "*.woff", "*.woff2"]):
-        _id = QFontDatabase.addApplicationFont(_fi.absoluteFilePath())
-        font_families |= set(QFontDatabase.applicationFontFamilies(_id))
-    return font_families
+        Returns
+        -------
+        set
+        A set of font families installed in the directory.
+        """
+        font_families = set()
+        for _fi in QDir(directory).entryInfoList(["*.ttf", "*.woff", "*.woff2"]):
+            _id = QFontDatabase.addApplicationFont(_fi.absoluteFilePath())
+            font_families |= set(QFontDatabase.applicationFontFamilies(_id))
+        result = set((max(font_families, key=len),))
+        return list(result)[0]
 
 
 def install_icons() -> None:
@@ -4252,8 +4302,8 @@ def run() -> None:
     )
     QCoreApplication.processEvents()
 
-    families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
-    logger.info(f"font families {families}")
+    # families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
+    # logger.info(f"font families {families}")
     window = MainWindow(splash)
     window.callsign.setFocus()
     splash.finish(window)

{not1mm-25.5.14 → not1mm-25.5.22}/not1mm/bandmap.py

@@ -19,7 +19,7 @@ from decimal import Decimal
 from json import loads
 
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
-from PyQt6.QtGui import QColorConstants, QPalette, QColor
+from PyQt6.QtGui import QColorConstants, QPalette, QColor, QFont
 from PyQt6.QtWidgets import QDockWidget
 from PyQt6.QtCore import Qt, pyqtSignal
 
@@ -343,6 +343,8 @@ class BandMapWindow(QDockWidget):
         self._udpwatch = None
 
         uic.loadUi(fsutils.APP_DATA_PATH / "bandmap.ui", self)
+        self.thefont = QFont()
+        self.thefont.setFamily("JetBrains Mono")
         self.settings = self.get_settings()
         self.clear_spot_olderSpinBox.setValue(
             int(self.settings.get("cluster_expire", 1))
@@ -581,6 +583,7 @@ class BandMapWindow(QDockWidget):
                 freq = self.currentBand.start + step * i
                 text = f"{freq:.3f}"
                 self.something = self.bandmap_scene.addText(text)
+                self.something.setFont(self.thefont)
                 self.something.setDefaultTextColor(self.text_color)
                 self.something.setPos(
                     -(self.something.boundingRect().width()) + 10,
@@ -726,6 +729,7 @@ class BandMapWindow(QDockWidget):
                     + " "
                     + items.get("ts").split()[1][:-3]
                 )
+                text.setFont(self.thefont)
                 text.document().setDocumentMargin(0)
                 text.setPos(60, text_y - (text.boundingRect().height() / 2))
                 text.setFlags(

{not1mm-25.5.14 → not1mm-25.5.22}/not1mm/data/about.ui

@@ -18,7 +18,7 @@
     <widget class="QLabel" name="label">
      <property name="font">
       <font>
-       <family>JetBrains Mono ExtraLight</family>
+       <family>JetBrains Mono</family>
        <pointsize>30</pointsize>
       </font>
      </property>

{not1mm-25.5.14 → not1mm-25.5.22}/not1mm/data/bandmap.ui

@@ -12,7 +12,7 @@
   </property>
   <property name="font">
    <font>
-    <family>JetBrains Mono ExtraLight</family>
+    <family>JetBrains Mono</family>
    </font>
   </property>
   <property name="windowTitle">
@@ -85,7 +85,7 @@
      <widget class="QScrollArea" name="scrollArea">
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>9</pointsize>
        </font>
       </property>
@@ -106,7 +106,7 @@
        </property>
        <property name="font">
         <font>
-         <family>JetBrains Mono ExtraLight</family>
+         <family>JetBrains Mono</family>
          <pointsize>9</pointsize>
         </font>
        </property>
@@ -115,7 +115,7 @@
          <widget class="QGraphicsView" name="graphicsView">
           <property name="font">
            <font>
-            <family>JetBrains Mono ExtraLight</family>
+            <family>JetBrains Mono</family>
             <pointsize>6</pointsize>
            </font>
           </property>

{not1mm-25.5.14 → not1mm-25.5.22}/not1mm/data/checkwindow.ui

@@ -12,7 +12,7 @@
   </property>
   <property name="font">
    <font>
-    <family>JetBrains Mono ExtraLight</family>
+    <family>JetBrains Mono</family>
    </font>
   </property>
   <property name="focusPolicy">
@@ -33,7 +33,7 @@
       </property>
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>12</pointsize>
        </font>
       </property>
@@ -70,7 +70,7 @@
       </property>
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>12</pointsize>
        </font>
       </property>
@@ -107,7 +107,7 @@
       </property>
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>12</pointsize>
        </font>
       </property>
@@ -141,7 +141,7 @@
      <widget class="QLabel" name="logListLabel">
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>10</pointsize>
        </font>
       </property>
@@ -154,7 +154,7 @@
      <widget class="QLabel" name="masterListLabel">
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>10</pointsize>
        </font>
       </property>
@@ -167,7 +167,7 @@
      <widget class="QLabel" name="telnetListLabel">
       <property name="font">
        <font>
-        <family>JetBrains Mono ExtraLight</family>
+        <family>JetBrains Mono</family>
         <pointsize>10</pointsize>
        </font>
       </property>