not1mm 25.3.27__tar.gz → 25.3.31__tar.gz

{not1mm-25.3.27 → not1mm-25.3.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.3.27
+Version: 25.3.31
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -247,7 +247,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [25-3-27] Add more DI and PH modeto stats window.
+- [25-3-31] Maybe try and do something useful with the detection of the systems dark mode.
+- [25-3-27-1] Detect system dark mode.
+- [25-3-27] Add more DI and PH mode to stats window.
 - [25-3-26] Record 0 points on dupes for each contest, excluding RandomGram.
 - [25-3-25-1] Improved process messaging.
 - [25-3-25] Use safer dict key access in the stats window.

{not1mm-25.3.27 → not1mm-25.3.31}/README.md

@@ -215,7 +215,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [25-3-27] Add more DI and PH modeto stats window.
+- [25-3-31] Maybe try and do something useful with the detection of the systems dark mode.
+- [25-3-27-1] Detect system dark mode.
+- [25-3-27] Add more DI and PH mode to stats window.
 - [25-3-26] Record 0 points on dupes for each contest, excluding RandomGram.
 - [25-3-25-1] Improved process messaging.
 - [25-3-25] Use safer dict key access in the stats window.

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/__main__.py

@@ -212,6 +212,11 @@ class MainWindow(QtWidgets.QMainWindow):
         uic.loadUi(fsutils.APP_DATA_PATH / "main.ui", self)
         self.history_info.hide()
         QApplication.instance().focusObjectChanged.connect(self.on_focus_changed)
+        QApplication.instance().styleHints().colorSchemeChanged.connect(
+            self.dark_watcher
+        )
+        self.dark_watcher(QApplication.instance().styleHints().colorScheme())
+
         self.inputs_dict = {
             self.callsign: "callsign",
             self.sent: "sent",
@@ -235,7 +240,8 @@ class MainWindow(QtWidgets.QMainWindow):
         self.cw_entry.returnPressed.connect(self.toggle_cw_entry)
 
         self.actionCW_Macros.triggered.connect(self.cw_macros_state_changed)
-        self.actionDark_Mode_2.triggered.connect(self.dark_mode_state_changed)
+        # self.actionDark_Mode_2.hide()
+        # self.actionDark_Mode_2.triggered.connect(self.dark_mode_state_changed)
         self.actionCommand_Buttons_2.triggered.connect(
             self.command_buttons_state_change
         )
@@ -771,6 +777,16 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         self.fldigi_qso(datagram.decode())
 
+    def is_it_dark(self) -> bool:
+        """Returns if the DE has a dark theme active."""
+        hints = QtGui.QGuiApplication.styleHints()
+        scheme = hints.colorScheme()
+        return scheme == Qt.ColorScheme.Dark
+
+    def dark_watcher(self, color_scheme):
+        """..."""
+        self.setDarkMode(setdarkmode=color_scheme == Qt.ColorScheme.Dark)
+
     def load_call_history(self) -> None:
         """Display filepicker and load chosen call history file."""
         filename = self.filepicker("other")
@@ -1009,18 +1025,18 @@ class MainWindow(QtWidgets.QMainWindow):
         cmd = {}
         cmd["cmd"] = "DARKMODE"
         cmd["state"] = setdarkmode
-        if self.log_window:
-            self.log_window.msg_from_main(cmd)
+        # if self.log_window:
+        #     self.log_window.msg_from_main(cmd)
         if self.bandmap_window:
             self.bandmap_window.msg_from_main(cmd)
-        if self.check_window:
-            self.check_window.msg_from_main(cmd)
-        if self.vfo_window:
-            self.vfo_window.msg_from_main(cmd)
-        if self.rate_window:
-            self.rate_window.msg_from_main(cmd)
-        if self.statistics_window:
-            self.statistics_window.msg_from_main(cmd)
+        # if self.check_window:
+        #     self.check_window.msg_from_main(cmd)
+        # if self.vfo_window:
+        #     self.vfo_window.msg_from_main(cmd)
+        # if self.rate_window:
+        #     self.rate_window.msg_from_main(cmd)
+        # if self.statistics_window:
+        #     self.statistics_window.msg_from_main(cmd)
 
         if setdarkmode:
             darkPalette = QPalette()
@@ -3046,12 +3062,12 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.lookup_service:
             self.lookup_service.msg_from_main(cmd)
 
-        if self.pref.get("darkmode"):
-            self.actionDark_Mode_2.setChecked(True)
-            self.setDarkMode(True)
-        else:
-            self.setDarkMode(False)
-            self.actionDark_Mode_2.setChecked(False)
+        # if self.pref.get("darkmode"):
+        # self.actionDark_Mode_2.setChecked(True)
+        # self.setDarkMode(True)
+        # else:
+        # self.setDarkMode(False)
+        # self.actionDark_Mode_2.setChecked(False)
 
         try:
             if self.rtc_thread.isRunning():
@@ -3235,9 +3251,9 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def dark_mode_state_changed(self) -> None:
         """Called when the Dark Mode menu state is changed."""
-        self.pref["darkmode"] = self.actionDark_Mode_2.isChecked()
-        self.write_preference()
-        self.setDarkMode(self.actionDark_Mode_2.isChecked())
+        # self.pref["darkmode"] = self.actionDark_Mode_2.isChecked()
+        # self.write_preference()
+        # # self.setDarkMode(self.actionDark_Mode_2.isChecked())
 
     def rtc_response(self, response):
         print(f"{response=}")

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/bandmap.py

@@ -21,7 +21,7 @@ from json import loads
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
 from PyQt6.QtGui import QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QDockWidget
-from PyQt6.QtCore import pyqtSignal
+from PyQt6.QtCore import Qt, pyqtSignal
 
 import not1mm.fsutils as fsutils
 
@@ -369,7 +369,7 @@ class BandMapWindow(QDockWidget):
         self.update_timer = QtCore.QTimer()
         self.update_timer.timeout.connect(self.update_station_timer)
         self.update_timer.start(UPDATE_INTERVAL)
-        self.setDarkMode(self.settings.get("darkmode", False))
+        self.setDarkMode()
         self.update()
         self.request_workedlist()
         self.request_contest()
@@ -486,51 +486,22 @@ class BandMapWindow(QDockWidget):
                 self.callsignField.setText(packet.get("operator", "").upper())
             return
         if packet.get("cmd", "") == "DARKMODE":
-            self.setDarkMode(packet.get("state", False))
+            self.setDarkMode()
 
-    def setDarkMode(self, setdarkmode=False):
+    def is_it_dark(self) -> bool:
+        """Returns if the DE has a dark theme active."""
+        hints = QtGui.QGuiApplication.styleHints()
+        scheme = hints.colorScheme()
+        return scheme == Qt.ColorScheme.Dark
+
+    def setDarkMode(self):
         """Set dark mode"""
-        if setdarkmode:
-            darkPalette = QPalette()
-            darkColor = QColor(56, 56, 56)
-            self.text_color = QColorConstants.White
-            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(
-                QPalette.ColorRole.HighlightedText, QColorConstants.Black
-            )
-            darkPalette.setColor(
-                QPalette.ColorGroup.Disabled,
-                QPalette.ColorRole.ButtonText,
-                disabledColor,
-            )
-            darkPalette.setColor(
-                QPalette.ColorGroup.Disabled,
-                QPalette.ColorRole.HighlightedText,
-                disabledColor,
-            )
-            darkPalette.setColor(
-                QPalette.ColorGroup.Disabled,
-                QPalette.ColorRole.Text,
-                disabledColor,
-            )
 
-            self.setPalette(darkPalette)
-            self.callsignField.setPalette(darkPalette)
+        setdarkmode = self.is_it_dark()
+        if setdarkmode is True:
+            self.text_color = QColorConstants.White
             self.update()
         else:
-            palette = self.style().standardPalette()
-            self.setPalette(palette)
-            self.callsignField.setPalette(palette)
             self.text_color = QColorConstants.Black
             self.update()
 

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/checkwindow.py

@@ -99,7 +99,7 @@ class CheckWindow(QDockWidget):
 
     def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
-
+        return
         if dark:
             darkPalette = QPalette()
             darkColor = QColor(56, 56, 56)

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/data/main.ui

@@ -1504,7 +1504,6 @@
      <string>View</string>
     </property>
     <addaction name="actionCW_Macros"/>
-    <addaction name="actionDark_Mode_2"/>
     <addaction name="actionCommand_Buttons_2"/>
    </widget>
    <widget class="QMenu" name="menuWindow">
@@ -2031,6 +2030,9 @@
    <property name="checkable">
     <bool>true</bool>
    </property>
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
    <property name="text">
     <string>Dark Mode</string>
    </property>

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.3.27"
+__version__ = "25.3.31"

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/logwindow.py

@@ -194,6 +194,7 @@ class LogWindow(QDockWidget):
                 self.generalLog.setColumnHidden(self.get_column(column), False)
                 self.focusedLog.setColumnHidden(self.get_column(column), False)
         if msg.get("cmd", "") == "DARKMODE":
+            print(f".................{msg.get("state", False)=}")
             self.set_dark_mode(msg.get("state", False))
 
     def resize_headers_to_match(self) -> None:
@@ -203,6 +204,7 @@ class LogWindow(QDockWidget):
 
     def set_dark_mode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
+        return
 
         if dark:
             darkPalette = QPalette()

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/ratewindow.py

@@ -73,7 +73,7 @@ class RateWindow(QDockWidget):
 
     def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
-
+        return
         if dark:
             darkPalette = QPalette()
             darkColor = QColor(56, 56, 56)

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/statistics.py

@@ -76,7 +76,7 @@ class StatsWindow(QDockWidget):
 
     def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
-
+        return
         if dark:
             darkPalette = QPalette()
             darkColor = QColor(56, 56, 56)

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm/vfo.py

@@ -57,7 +57,7 @@ class VfoWindow(QDockWidget):
 
     def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
-
+        return
         if dark:
             darkPalette = QPalette()
             darkColor = QColor(56, 56, 56)

{not1mm-25.3.27 → not1mm-25.3.31}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.3.27
+Version: 25.3.31
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -247,7 +247,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [25-3-27] Add more DI and PH modeto stats window.
+- [25-3-31] Maybe try and do something useful with the detection of the systems dark mode.
+- [25-3-27-1] Detect system dark mode.
+- [25-3-27] Add more DI and PH mode to stats window.
 - [25-3-26] Record 0 points on dupes for each contest, excluding RandomGram.
 - [25-3-25-1] Improved process messaging.
 - [25-3-25] Use safer dict key access in the stats window.

{not1mm-25.3.27 → not1mm-25.3.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.3.27"
+version = "25.3.31"
 description = "NOT1MM Logger"
 license = { text = "GPL-3.0-or-later" }
 readme = "README.md"