not1mm 25.4.28__py3-none-any.whl → 25.5.21__py3-none-any.whl

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:
@@ -2121,6 +2159,9 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.cw.servertype == 2:
                 self.cw.winkeyer_stop()
                 return
+            if self.cw.servertype == 3:
+                self.rig_control.cat.stopcwrigctl()
+                return
         if self.rig_control:
             if self.rig_control.online:
                 if self.pref.get("cwtype") == 3 and self.rig_control is not None:
@@ -2869,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(3, "T"))
+            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", ""))
@@ -2882,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(3, "T")
+                "{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())
@@ -4174,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:
@@ -4249,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/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/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/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/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>