not1mm 24.4.26__tar.gz → 24.4.30__tar.gz

{not1mm-24.4.26 → not1mm-24.4.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.26
+Version: 24.4.30
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -31,6 +31,7 @@ Requires-Dist: appdata
 Requires-Dist: Levenshtein
 
 # Not1MM
+<!-- markdownlint-disable MD001 MD033 -->
 
  ![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
 
@@ -55,16 +56,16 @@ Requires-Dist: Levenshtein
     - [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)
-      - [Ubuntu 24.04](#ubuntu-2404)
+      - [Ubuntu 24.04 LTS](#ubuntu-2404-lts)
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
+    - [Installing from GitHub source](#installing-from-github-source)
   - [After the install](#after-the-install)
     - [You may or may not get a warning message like](#you-may-or-may-not-get-a-warning-message-like)
     - [Or this fan favorite](#or-this-fan-favorite)
-    - [Installing from GitHub source](#installing-from-github-source)
   - [Various data file locations](#various-data-file-locations)
     - [Data](#data)
     - [Config](#config)
@@ -179,6 +180,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-30] Allowsending CW via rigctld if your radio supports it.
+- [24-4-27] Cleaned up dark mode code.
 - [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
 - [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
 - [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
@@ -217,6 +220,10 @@ through your distribution's package manager before continuing.
 I've taken the time to install some common Linux distributions into a VM and
 noted the minimum steps needed to install not1mm.
 
+<details>
+
+<summary><b>Ubuntu 22.04 LTS, 23.04 and 24.04 LTS</b></summary>
+
 #### Ubuntu 22.04 LTS
 
 ```bash
@@ -236,7 +243,7 @@ pipx install not1mm
 pipx ensurepath
 ```
 
-#### Ubuntu 24.04
+#### Ubuntu 24.04 LTS
 
 ```bash
 sudo apt update
@@ -246,6 +253,12 @@ pip install --break-system-packages not1mm
 source .profile
 ```
 
+</details>
+
+<details>
+
+<summary><b>Fedora 38, 39 and 40</b></summary>
+
 #### Fedora 38 & 39
 
 ```bash
@@ -262,6 +275,9 @@ sudo dnf install python3-pip python3-pyqt6 portaudio
 pip install not1mm
 ```
 
+</details>
+<br>
+
 You can now open a new terminal and type not1mm. On it's first run, it may or
 may not install a lovely non AI generated icon, which you can later click on to
 launch the application.
@@ -313,6 +329,40 @@ If you need to later update not1mm, you can do so with:
 pipx upgrade not1mm
 ```
 
+<details>
+<summary><b>Installing from GitHub source.</b></summary>
+
+### Installing from GitHub source
+
+Since this is packaged for PyPI, if you want to work on your own source branch,
+after cloning from github you would:
+
+```bash
+pip install --upgrade pip
+pip install setuptools
+pip install build
+source rebuild.sh
+```
+
+from the root directory. This installs a build chain and a local editable copy
+of not1mm.
+
+There's two ways to launch the program from the local editable copy.
+
+You can either be in the root of the source directory and type:
+
+```bash
+python not1mm
+```
+
+or be in some other directory and just type:
+
+```bash
+not1mm
+```
+
+</details>
+
 ## After the install
 
 You can now open a new terminal and type `not1mm`. On it's first run, it may or
@@ -344,35 +394,6 @@ For a more permanent solution you can place the line
 `export QT_QPA_PLATFORM=wayland` in your home directories .bashrc file. Then
 after logging out and back in you should be able to launch it normally.
 
-### Installing from GitHub source
-
-Since this is packaged for PyPI, if you want to work on your own source branch,
-after cloning from github you would:
-
-```bash
-pip install --upgrade pip
-pip install setuptools
-pip install build
-source rebuild.sh
-```
-
-from the root directory. This installs a build chain and a local editable copy
-of not1mm.
-
-There's two ways to launch the program from the local editable copy.
-
-You can either be in the root of the source directory and type:
-
-```bash
-python not1mm
-```
-
-or be in some other directory and just type:
-
-```bash
-not1mm
-```
-
 ## Various data file locations
 
 ### Data
@@ -482,7 +503,10 @@ onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 Under the `CW` TAB, There are three options. `cwdaemon`, which normally uses IP
 `127.0.0.1` and port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` and
-port `8000`. Or `None`, if you want to Morse it like it's 1899.
+`CAT` which if your radio supports it, sends Morse characters via rigctld. As far
+as I can tell rigctld does not support setting the radios internal keyer speed. So
+the CW speed control widget will not be functional and you'd need to control the
+keyer speed thru the radios interface.
 
 ### Cluster
 

{not1mm-24.4.26 → not1mm-24.4.30}/README.md

@@ -1,4 +1,5 @@
 # Not1MM
+<!-- markdownlint-disable MD001 MD033 -->
 
  ![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
 
@@ -23,16 +24,16 @@
     - [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)
-      - [Ubuntu 24.04](#ubuntu-2404)
+      - [Ubuntu 24.04 LTS](#ubuntu-2404-lts)
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
+    - [Installing from GitHub source](#installing-from-github-source)
   - [After the install](#after-the-install)
     - [You may or may not get a warning message like](#you-may-or-may-not-get-a-warning-message-like)
     - [Or this fan favorite](#or-this-fan-favorite)
-    - [Installing from GitHub source](#installing-from-github-source)
   - [Various data file locations](#various-data-file-locations)
     - [Data](#data)
     - [Config](#config)
@@ -147,6 +148,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-30] Allowsending CW via rigctld if your radio supports it.
+- [24-4-27] Cleaned up dark mode code.
 - [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
 - [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
 - [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
@@ -185,6 +188,10 @@ through your distribution's package manager before continuing.
 I've taken the time to install some common Linux distributions into a VM and
 noted the minimum steps needed to install not1mm.
 
+<details>
+
+<summary><b>Ubuntu 22.04 LTS, 23.04 and 24.04 LTS</b></summary>
+
 #### Ubuntu 22.04 LTS
 
 ```bash
@@ -204,7 +211,7 @@ pipx install not1mm
 pipx ensurepath
 ```
 
-#### Ubuntu 24.04
+#### Ubuntu 24.04 LTS
 
 ```bash
 sudo apt update
@@ -214,6 +221,12 @@ pip install --break-system-packages not1mm
 source .profile
 ```
 
+</details>
+
+<details>
+
+<summary><b>Fedora 38, 39 and 40</b></summary>
+
 #### Fedora 38 & 39
 
 ```bash
@@ -230,6 +243,9 @@ sudo dnf install python3-pip python3-pyqt6 portaudio
 pip install not1mm
 ```
 
+</details>
+<br>
+
 You can now open a new terminal and type not1mm. On it's first run, it may or
 may not install a lovely non AI generated icon, which you can later click on to
 launch the application.
@@ -281,6 +297,40 @@ If you need to later update not1mm, you can do so with:
 pipx upgrade not1mm
 ```
 
+<details>
+<summary><b>Installing from GitHub source.</b></summary>
+
+### Installing from GitHub source
+
+Since this is packaged for PyPI, if you want to work on your own source branch,
+after cloning from github you would:
+
+```bash
+pip install --upgrade pip
+pip install setuptools
+pip install build
+source rebuild.sh
+```
+
+from the root directory. This installs a build chain and a local editable copy
+of not1mm.
+
+There's two ways to launch the program from the local editable copy.
+
+You can either be in the root of the source directory and type:
+
+```bash
+python not1mm
+```
+
+or be in some other directory and just type:
+
+```bash
+not1mm
+```
+
+</details>
+
 ## After the install
 
 You can now open a new terminal and type `not1mm`. On it's first run, it may or
@@ -312,35 +362,6 @@ For a more permanent solution you can place the line
 `export QT_QPA_PLATFORM=wayland` in your home directories .bashrc file. Then
 after logging out and back in you should be able to launch it normally.
 
-### Installing from GitHub source
-
-Since this is packaged for PyPI, if you want to work on your own source branch,
-after cloning from github you would:
-
-```bash
-pip install --upgrade pip
-pip install setuptools
-pip install build
-source rebuild.sh
-```
-
-from the root directory. This installs a build chain and a local editable copy
-of not1mm.
-
-There's two ways to launch the program from the local editable copy.
-
-You can either be in the root of the source directory and type:
-
-```bash
-python not1mm
-```
-
-or be in some other directory and just type:
-
-```bash
-not1mm
-```
-
 ## Various data file locations
 
 ### Data
@@ -450,7 +471,10 @@ onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 Under the `CW` TAB, There are three options. `cwdaemon`, which normally uses IP
 `127.0.0.1` and port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` and
-port `8000`. Or `None`, if you want to Morse it like it's 1899.
+`CAT` which if your radio supports it, sends Morse characters via rigctld. As far
+as I can tell rigctld does not support setting the radios internal keyer speed. So
+the CW speed control widget will not be functional and you'd need to control the
+keyer speed thru the radios interface.
 
 ### Cluster
 

{not1mm-24.4.26 → not1mm-24.4.30}/not1mm/__main__.py

@@ -38,7 +38,7 @@ except OSError as exception:
 import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt, QThread
-from PyQt6.QtGui import QFontDatabase, QColorConstants
+from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QFileDialog
 
 from not1mm.lib.about import About
@@ -567,76 +567,50 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         print(f"{result=}")
 
-    def setDarkMode(self, dark):
-        """testing"""
+    def setDarkMode(self, setdarkmode=False) -> None:
+        """Forces a darkmode palette."""
 
-        logger.debug(f"Dark mode set to: {dark}")
+        logger.debug(f"Dark mode set to: {setdarkmode}")
 
         cmd = {}
         cmd["cmd"] = "DARKMODE"
-        cmd["state"] = dark
+        cmd["state"] = setdarkmode
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
 
-        if dark:
-            darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(56, 56, 56)
-            disabledColor = QtGui.QColor(127, 127, 127)
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Window, darkColor)
+        if setdarkmode:
+            darkPalette = QPalette()
+            darkColor = QColor(56, 56, 56)
+            disabledColor = QColor(127, 127, 127)
+            darkPalette.setColor(QPalette.ColorRole.Window, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.WindowText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Base, QColor(45, 45, 45))
+            darkPalette.setColor(QPalette.ColorRole.AlternateBase, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.Text, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Button, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.ButtonText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.BrightText, QColorConstants.Red)
+            darkPalette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
+            darkPalette.setColor(QPalette.ColorRole.Highlight, QColor(42, 130, 218))
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.WindowText, QColorConstants.White
+                QPalette.ColorRole.HighlightedText, QColorConstants.Black
             )
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Base, QtGui.QColor(45, 45, 45)
-            )
-            darkPalette.setColor(QtGui.QPalette.ColorRole.AlternateBase, darkColor)
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Text, QColorConstants.White)
-            darkPalette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.Text,
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.ButtonText,
                 disabledColor,
             )
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Button, darkColor)
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.ButtonText, QColorConstants.White
-            )
             darkPalette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.ButtonText,
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.HighlightedText,
                 disabledColor,
             )
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.BrightText, QColorConstants.Red
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Link, QtGui.QColor(42, 130, 218)
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Highlight, QtGui.QColor(42, 130, 218)
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.HighlightedText, QColorConstants.Black
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.HighlightedText,
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.Text,
                 disabledColor,
             )
-            dark_button_style = (
-                "QPushButton {"
-                "background-color: rgb(56,56,56);"
-                "color: white;"
-                "border-style: outset;"
-                "border-width: 2px;"
-                "border-radius: 5px;"
-                "border-color: rgb(45,45,45);"
-                "padding: 6px;"
-                "}"
-                "QPushButton:pressed {"
-                "background-color: rgb(127, 127, 127);"
-                "border-style: inset;"
-                "}"
-            )
+
             self.current_palette = darkPalette
             self.setPalette(darkPalette)
             self.text_color = QColorConstants.White
@@ -651,18 +625,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.other_1.setPalette(darkPalette)
             self.other_2.setPalette(darkPalette)
             self.cw_entry.setPalette(darkPalette)
-            self.F1.setStyleSheet(dark_button_style)
-            self.F2.setStyleSheet(dark_button_style)
-            self.F3.setStyleSheet(dark_button_style)
-            self.F4.setStyleSheet(dark_button_style)
-            self.F5.setStyleSheet(dark_button_style)
-            self.F6.setStyleSheet(dark_button_style)
-            self.F7.setStyleSheet(dark_button_style)
-            self.F8.setStyleSheet(dark_button_style)
-            self.F9.setStyleSheet(dark_button_style)
-            self.F10.setStyleSheet(dark_button_style)
-            self.F11.setStyleSheet(dark_button_style)
-            self.F12.setStyleSheet(dark_button_style)
         else:
             palette = self.style().standardPalette()
             self.current_palette = palette
@@ -679,33 +641,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.other_2.setPalette(palette)
             self.cw_entry.setPalette(palette)
             self.text_color = QColorConstants.Black
-            light_button_style = (
-                "QPushButton {"
-                "background-color: rgb(245,245,245);"
-                "color: rgb(52,52,52);"
-                "border-style: outset;"
-                "border-width: 2px;"
-                "border-radius: 5px;"
-                "border-color: rgb(150,150,150);"
-                "padding: 6px;"
-                "}"
-                "QPushButton:pressed {"
-                "background-color: rgb(127, 127, 127);"
-                "border-style: inset;"
-                "}"
-            )
-            self.F1.setStyleSheet(light_button_style)
-            self.F2.setStyleSheet(light_button_style)
-            self.F3.setStyleSheet(light_button_style)
-            self.F4.setStyleSheet(light_button_style)
-            self.F5.setStyleSheet(light_button_style)
-            self.F6.setStyleSheet(light_button_style)
-            self.F7.setStyleSheet(light_button_style)
-            self.F8.setStyleSheet(light_button_style)
-            self.F9.setStyleSheet(light_button_style)
-            self.F10.setStyleSheet(light_button_style)
-            self.F11.setStyleSheet(light_button_style)
-            self.F12.setStyleSheet(light_button_style)
 
     def set_radio_icon(self, state: int) -> None:
         """
@@ -770,7 +705,9 @@ class MainWindow(QtWidgets.QMainWindow):
             # self.send_backspace()
             self.oldtext = newtext
             return
-        if self.cw is not None:
+        if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+            self.rig_control.sendcw(newtext[len(self.oldtext) :])
+        elif self.cw is not None:
             self.cw.sendcw(newtext[len(self.oldtext) :])
         self.oldtext = newtext
 
@@ -2375,6 +2312,9 @@ class MainWindow(QtWidgets.QMainWindow):
             self.voice_string(self.process_macro(function_key.toolTip()))
             return
         if self.cw:
+            if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                self.rig_control.sendcw(self.process_macro(function_key.toolTip()))
+                return
             self.cw.sendcw(self.process_macro(function_key.toolTip()))
 
     def run_sp_buttons_clicked(self) -> None: