not1mm 24.3.25__tar.gz → 24.3.25.1__tar.gz

{not1mm-24.3.25 → not1mm-24.3.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.3.25
+Version: 24.3.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -167,6 +167,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-3-25-1] Dark mode sorted out. Atleast for me...
 - [24-3-25] Yanked version 24-3-24-1. Fixed widget focus issues.
 - [24-3-24-1] Killed an SQL query bug causing crash when pressing arrow down. 
 - [24-3-24] Reworked fsutil.py to correct directory paths for Linux.

{not1mm-24.3.25 → not1mm-24.3.25.1}/README.md

@@ -136,6 +136,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-3-25-1] Dark mode sorted out. Atleast for me...
 - [24-3-25] Yanked version 24-3-24-1. Fixed widget focus issues.
 - [24-3-24-1] Killed an SQL query bug causing crash when pressing arrow down. 
 - [24-3-24] Reworked fsutil.py to correct directory paths for Linux.

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm/__main__.py

@@ -501,12 +501,11 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if dark:
             darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(45, 45, 45)
-
+            darkColor = QtGui.QColor(56, 56, 56)
             disabledColor = QtGui.QColor(127, 127, 127)
             darkPalette.setColor(QtGui.QPalette.Window, darkColor)
             darkPalette.setColor(QtGui.QPalette.WindowText, Qt.white)
-            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(18, 18, 18))
+            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(45, 45, 45))
             darkPalette.setColor(QtGui.QPalette.AlternateBase, darkColor)
             darkPalette.setColor(QtGui.QPalette.Text, Qt.white)
             darkPalette.setColor(
@@ -524,6 +523,21 @@ class MainWindow(QtWidgets.QMainWindow):
             darkPalette.setColor(
                 QtGui.QPalette.Disabled, QtGui.QPalette.HighlightedText, 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 = Qt.white
@@ -538,7 +552,18 @@ 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
@@ -555,6 +580,33 @@ class MainWindow(QtWidgets.QMainWindow):
             self.other_2.setPalette(palette)
             self.cw_entry.setPalette(palette)
             self.text_color = Qt.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:
         """
@@ -3270,9 +3322,7 @@ logging.basicConfig(
 )
 logging.getLogger("PyQt5.uic.uiparser").setLevel("INFO")
 logging.getLogger("PyQt5.uic.properties").setLevel("INFO")
-os.environ["QT_QPA_PLATFORMTHEME"] = "gnome"
 app = QtWidgets.QApplication(sys.argv)
-
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
 window = MainWindow()

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm/bandmap.py

@@ -369,12 +369,12 @@ class BandMapWindow(QtWidgets.QDockWidget):
 
         if setdarkmode:
             darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(45, 45, 45)
+            darkColor = QtGui.QColor(56, 56, 56)
             self.text_color = Qt.white
             disabledColor = QtGui.QColor(127, 127, 127)
             darkPalette.setColor(QtGui.QPalette.Window, darkColor)
             darkPalette.setColor(QtGui.QPalette.WindowText, Qt.white)
-            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(18, 18, 18))
+            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(45, 45, 45))
             darkPalette.setColor(QtGui.QPalette.AlternateBase, darkColor)
             darkPalette.setColor(QtGui.QPalette.Text, Qt.white)
             darkPalette.setColor(
@@ -396,12 +396,50 @@ class BandMapWindow(QtWidgets.QDockWidget):
             self.setPalette(darkPalette)
             self.callsignField.setPalette(darkPalette)
             self.update()
+            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.connectButton.setStyleSheet(dark_button_style)
+            self.clearButton.setStyleSheet(dark_button_style)
+            self.zoominButton.setStyleSheet(dark_button_style)
+            self.zoomoutButton.setStyleSheet(dark_button_style)
         else:
             palette = self.style().standardPalette()
             self.setPalette(palette)
             self.callsignField.setPalette(palette)
             self.text_color = Qt.black
             self.update()
+            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.connectButton.setStyleSheet(light_button_style)
+            self.clearButton.setStyleSheet(light_button_style)
+            self.zoominButton.setStyleSheet(light_button_style)
+            self.zoomoutButton.setStyleSheet(light_button_style)
 
     def connect(self):
         """Connect to the cluster."""
@@ -417,7 +455,7 @@ class BandMapWindow(QtWidgets.QDockWidget):
         port = self.settings.get("cluster_port", 7373)
         logger.info(f"connecting to dx cluster {server} {port}")
         self.socket.connectToHost(server, port)
-        self.connectButton.setStyleSheet("color: white;")
+        # self.connectButton.setStyleSheet("color: white;")
         self.connectButton.setText("Connecting")
         self.connected = True
 
@@ -854,13 +892,13 @@ class BandMapWindow(QtWidgets.QDockWidget):
                     logger.debug(f"couldn't parse freq from datablock {data}")
                 return
             if self.callsignField.text().upper() in data:
-                self.connectButton.setStyleSheet("color: green;")
+                # self.connectButton.setStyleSheet("color: green;")
                 self.connectButton.setText("Connected")
                 logger.debug(f"callsign login acknowledged {data}")
 
     def maybeconnected(self) -> None:
         """Update visual state of the connect button."""
-        self.connectButton.setStyleSheet("color: yellow;")
+        # self.connectButton.setStyleSheet("color: yellow;")
         self.connectButton.setText("Connecting")
 
     def socket_error(self) -> None:
@@ -870,7 +908,7 @@ class BandMapWindow(QtWidgets.QDockWidget):
     def disconnected(self) -> None:
         """Called when socket is disconnected."""
         self.connected = False
-        self.connectButton.setStyleSheet("color: red;")
+        # self.connectButton.setStyleSheet("color: red;")
         self.connectButton.setText("Closed")
 
     def send_command(self, cmd: str) -> None:
@@ -899,7 +937,7 @@ class BandMapWindow(QtWidgets.QDockWidget):
             logger.info("Closing dx cluster connection")
             self.socket.close()
             self.connected = False
-            self.connectButton.setStyleSheet("color: red;")
+            # self.connectButton.setStyleSheet("color: red;")
             self.connectButton.setText("Closed")
 
     def closeEvent(self, _event: QtGui.QCloseEvent) -> None:

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm/checkwindow.py

@@ -63,11 +63,11 @@ class CheckWindow(QWidget):
 
         if dark:
             darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(45, 45, 45)
+            darkColor = QtGui.QColor(56, 56, 56)
             disabledColor = QtGui.QColor(127, 127, 127)
             darkPalette.setColor(QtGui.QPalette.Window, darkColor)
             darkPalette.setColor(QtGui.QPalette.WindowText, Qt.white)
-            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(18, 18, 18))
+            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(45, 45, 45))
             darkPalette.setColor(QtGui.QPalette.AlternateBase, darkColor)
             darkPalette.setColor(QtGui.QPalette.Text, Qt.white)
             darkPalette.setColor(

not1mm-24.3.25.1/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "24.3.25.1"

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm/logwindow.py

@@ -25,8 +25,6 @@ from not1mm.lib.n1mm import N1MM
 
 logger = logging.getLogger(__name__)
 
-# os.environ["QT_QPA_PLATFORMTHEME"] = "gnome"
-
 
 def safe_float(the_input: any, default=0.0) -> float:
     """
@@ -168,11 +166,11 @@ class LogWindow(QtWidgets.QWidget):
 
         if dark:
             dark_palette = QtGui.QPalette()
-            dark_color = QtGui.QColor(45, 45, 45)
+            dark_color = QtGui.QColor(56, 56, 56)
             disabled_color = QtGui.QColor(127, 127, 127)
             dark_palette.setColor(QtGui.QPalette.Window, dark_color)
             dark_palette.setColor(QtGui.QPalette.WindowText, Qt.white)
-            dark_palette.setColor(QtGui.QPalette.Base, QtGui.QColor(18, 18, 18))
+            dark_palette.setColor(QtGui.QPalette.Base, QtGui.QColor(45, 45, 45))
             dark_palette.setColor(QtGui.QPalette.AlternateBase, dark_color)
             dark_palette.setColor(QtGui.QPalette.Text, Qt.white)
             dark_palette.setColor(

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm/vfo.py

@@ -65,11 +65,11 @@ class VfoWindow(QWidget):
 
         if dark:
             darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(45, 45, 45)
+            darkColor = QtGui.QColor(56, 56, 56)
             disabledColor = QtGui.QColor(127, 127, 127)
             darkPalette.setColor(QtGui.QPalette.Window, darkColor)
             darkPalette.setColor(QtGui.QPalette.WindowText, Qt.white)
-            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(18, 18, 18))
+            darkPalette.setColor(QtGui.QPalette.Base, QtGui.QColor(45, 45, 45))
             darkPalette.setColor(QtGui.QPalette.AlternateBase, darkColor)
             darkPalette.setColor(QtGui.QPalette.Text, Qt.white)
             darkPalette.setColor(

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.3.25
+Version: 24.3.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -167,6 +167,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-3-25-1] Dark mode sorted out. Atleast for me...
 - [24-3-25] Yanked version 24-3-24-1. Fixed widget focus issues.
 - [24-3-24-1] Killed an SQL query bug causing crash when pressing arrow down. 
 - [24-3-24] Reworked fsutil.py to correct directory paths for Linux.

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm.egg-info/SOURCES.txt

@@ -146,12 +146,6 @@ not1mm/plugins/naqp_ssb.py
 not1mm/plugins/phone_weekly_test.py
 not1mm/plugins/stew_perry_topband.py
 not1mm/plugins/winter_field_day.py
-not1mm/testing/fakeflrig.py
-not1mm/testing/flrigclient.py
-not1mm/testing/multicast_listener.py
-not1mm/testing/n1mm_listener.py
-not1mm/testing/simulant.py
-not1mm/testing/test.py
 testing/detectdark.py
 testing/test.py
 usb_vfo_knob/code.py

{not1mm-24.3.25 → not1mm-24.3.25.1}/not1mm.egg-info/top_level.txt

@@ -2,5 +2,3 @@ dist
 not1mm
 pic
 research
-testing
-usb_vfo_knob

{not1mm-24.3.25 → not1mm-24.3.25.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.3.25"
+version = "24.3.25.1"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -43,6 +43,8 @@ classifiers = [
 [tool.setuptools.packages.find]
 where = ["."]
 
+exclude = ["not1mm.testing*", "not1mm.not1mm.testing*", "testing*", "usb_vfo_knob*",]
+
 [tool.setuptools.package-data]
 "not1mm.data" = ["*.json", "*.txt", "*.SCP", "*.ui", "*.ttf", "*.desktop", "*.png", "*.qss", "*.sql", "*.html",]
 "not1mm.data.phonetics" = ["*.wav",]

not1mm-24.3.25/not1mm/lib/version.py

@@ -1,3 +0,0 @@
-"""It's the version"""
-
-__version__ = "24.3.25"

not1mm-24.3.25/not1mm/testing/fakeflrig.py

@@ -1,88 +0,0 @@
-"""Main PC does not have radio attached. So we'll make a fake flrig server."""
-import logging
-from xmlrpc.server import SimpleXMLRPCServer
-from xmlrpc.server import SimpleXMLRPCRequestHandler
-
-
-logging.basicConfig(level=logging.WARNING)
-
-radio_state = {
-    "freq": "14032000",
-    "mode": "CW",
-    "bw": "50",
-    "ptt": 0,
-}
-
-
-class RequestHandler(SimpleXMLRPCRequestHandler):
-    """Doc String"""
-
-    rpc_paths = ("/RPC2",)
-
-
-def get_vfo():
-    """return frequency in hz"""
-    return str(int(radio_state["freq"]))
-
-
-def set_vfo(freq):
-    """set frequency in hz"""
-    logging.warning("%s", f"Frequency set to: {freq} {type(freq)}")
-    radio_state["freq"] = freq
-    return 0
-
-
-def set_frequency(freq):
-    """seturn frequency in hz"""
-    logging.warning("%s", f"Frequency set to: {freq} {type(freq)}")
-    radio_state["freq"] = freq
-    return 0
-
-
-def get_mode():
-    """return mode"""
-    return radio_state["mode"]
-
-
-def set_mode(mode):
-    """set frequency in hz"""
-    logging.warning("%s", f"Mode set to: {mode}")
-    radio_state["mode"] = mode
-    return 0
-
-
-def get_bw():
-    """return bandwidth"""
-    return [radio_state["bw"], ""]
-
-
-def set_bw(bandwidth):
-    """set bandwidth"""
-    radio_state["bw"] = bandwidth
-
-
-def get_version():
-    """return flrig version"""
-    return "1.4.8"
-
-
-print("Stupid server to fake an flrig CAT control server.")
-
-# Create server
-with SimpleXMLRPCServer(
-    ("0.0.0.0", 12345),
-    requestHandler=RequestHandler,
-    logRequests=False,
-    allow_none=True,
-) as server:
-    server.register_function(get_vfo, name="rig.get_vfo")
-    server.register_function(get_mode, name="rig.get_mode")
-    server.register_function(set_vfo, name="rig.set_vfo")
-    server.register_function(set_frequency, name="rig.set_frequency")
-    server.register_function(set_mode, name="rig.set_mode")
-    server.register_function(get_bw, name="rig.get_bw")
-    server.register_function(set_bw, name="rig.set_bw")
-    server.register_function(get_version, name="main.get_version")
-
-    server.register_introspection_functions()
-    server.serve_forever()

not1mm-24.3.25/not1mm/testing/flrigclient.py

@@ -1,54 +0,0 @@
-"""Fake client to test flrig"""
-import xmlrpc.client
-
-TARGET = "http://localhost:12345"
-server = xmlrpc.client.ServerProxy(TARGET)
-
-try:  # show the version
-    response = server.main.get_version()
-    print(f"Version: {response} {type(response)}")
-except ConnectionRefusedError as exception:
-    print(f"{exception}")
-except xmlrpc.client.Fault as exception:
-    print(f"{exception}")
-
-try:  # get the vfo
-    response = server.rig.get_vfo()
-    print(f"VFO: {response} {type(response)}")
-except ConnectionRefusedError as exception:
-    print(f"{exception}")
-except xmlrpc.client.Fault as exception:
-    print(f"{exception}")
-
-try:  # set the vfo
-    response = server.rig.set_vfo(float(7035000.0))
-    print(f"Setting VFO: {response} {type(response)}")
-except ConnectionRefusedError as exception:
-    print(f"{exception}")
-except xmlrpc.client.Fault as exception:
-    print(f"{exception}")
-
-try:  # get the vfo
-    response = server.rig.get_vfo()
-    print(f"VFO: {response} {type(response)}")
-except ConnectionRefusedError as exception:
-    print(f"{exception}")
-except xmlrpc.client.Fault as exception:
-    print(f"{exception}")
-
-try:  # set the frequency
-    response = server.rig.set_frequency(float(7350000.0))
-    print(f"Setting Frequency: {response} {type(response)}")
-except ConnectionRefusedError as exception:
-    print(f"{exception}")
-except xmlrpc.client.Fault as exception:
-    print(f"{exception}")
-
-
-try:  # get the vfo
-    response = server.rig.get_vfo()
-    print(f"VFO: {response} {type(response)}")
-except ConnectionRefusedError as exception:
-    print(f"{exception}")
-except xmlrpc.client.Fault as exception:
-    print(f"{exception}")

not1mm-24.3.25/not1mm/testing/multicast_listener.py

@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-"""Test multicasting"""
-# pylint: disable=invalid-name
-import socket
-import time
-import threading
-import queue
-
-multicast_port = 2239
-multicast_group = "224.1.1.1"
-interface_ip = "0.0.0.0"
-
-fifo = queue.Queue()
-
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-s.bind(("", multicast_port))
-mreq = socket.inet_aton(multicast_group) + socket.inet_aton(interface_ip)
-s.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, bytes(mreq))
-s.settimeout(0.1)
-
-
-def watch_udp():
-    """watch udp"""
-    while True:
-        try:
-            datagram = s.recv(1500)
-        except socket.timeout:
-            time.sleep(1)
-            continue
-        if datagram:
-            fifo.put(datagram)
-
-
-_udpwatch = threading.Thread(
-    target=watch_udp,
-    daemon=True,
-)
-_udpwatch.start()
-
-while 1:
-    # print("Waiting...")
-    while not fifo.empty():
-        timestamp = time.strftime("%H:%M:%S", time.gmtime())
-        print(f"[{timestamp}] {fifo.get()}\n")
-    time.sleep(1)

not1mm-24.3.25/not1mm/testing/n1mm_listener.py

@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-"""Test multicasting"""
-# pylint: disable=invalid-name
-import socket
-import time
-import threading
-import queue
-import xmltodict
-
-multicast_port = 12061
-multicast_group = "127.0.0.1"
-interface_ip = "0.0.0.0"
-
-fifo = queue.Queue()
-
-s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-s.bind(("127.0.0.1", multicast_port))
-# mreq = socket.inet_aton(multicast_group) + socket.inet_aton(interface_ip)
-# s.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, bytes(mreq))
-s.settimeout(0.1)
-
-
-def watch_udp():
-    """watch udp"""
-    while True:
-        try:
-            datagram = s.recv(1500)
-        except socket.timeout:
-            time.sleep(1)
-            continue
-        if datagram:
-            fifo.put(datagram)
-
-
-_udpwatch = threading.Thread(
-    target=watch_udp,
-    daemon=True,
-)
-_udpwatch.start()
-
-while 1:
-    # print("Waiting...")
-    while not fifo.empty():
-        timestamp = time.strftime("%H:%M:%S", time.gmtime())
-        print(f"[{timestamp}] {xmltodict.parse(fifo.get())}\n")
-    time.sleep(1)