not1mm 25.3.26__py3-none-any.whl → 25.3.27.1__py3-none-any.whl

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")
@@ -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/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/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.3.26"
+__version__ = "25.3.27.1"

not1mm/statistics.py

@@ -178,7 +178,7 @@ class StatsWindow(QDockWidget):
             item = QtWidgets.QTableWidgetItem(str(result.get("points", "0")))
             item.setTextAlignment(0x0002)
             self.tableWidget.setItem(row, 6, item)
-            query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE Mode WHEN 'LSB' THEN 'PH' WHEN 'USB' THEN 'PH' WHEN 'CW' THEN 'CW' WHEN 'RTTY' THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest} and Band = '{band['band']}') as sortedmode;"
+            query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE WHEN Mode IN ('LSB','USB','SSB','FM','AM') THEN 'PH' WHEN Mode IN ('CW','CW-R') THEN 'CW' WHEN Mode IN ('FT8','FT4','RTTY','PSK31','FSK441','MSK144','JT65','JT9','Q65') THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest} and Band = '{band['band']}') as sortedmode;"
             result = self.database.exec_sql(query)
             item = QtWidgets.QTableWidgetItem(str(result.get("CW", "0")))
             item.setTextAlignment(0x0002)
@@ -206,7 +206,7 @@ class StatsWindow(QDockWidget):
         item.setTextAlignment(0x0002)
         self.tableWidget.setItem(row, 6, item)
 
-        query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE Mode WHEN 'LSB' THEN 'PH' WHEN 'USB' THEN 'PH' WHEN 'CW' THEN 'CW' WHEN 'RTTY' THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest}) as sortedmode;"
+        query = f"select sum(sortedmode.mode == 'CW') as CW, sum(sortedmode.mode == 'PH') as PH, sum(sortedmode.mode == 'DI') as DI from (select CASE WHEN Mode IN ('LSB','USB','SSB','FM','AM') THEN 'PH' WHEN Mode IN ('CW','CW-R') THEN 'CW' WHEN Mode In ('FT8','FT4','RTTY','PSK31','FSK441','MSK144','JT65','JT9','Q65') THEN 'DI' ELSE 'OTHER' END mode from DXLOG where ContestNR = {self.database.current_contest}) as sortedmode;"
         result = self.database.exec_sql(query)
         item = QtWidgets.QTableWidgetItem(str(result.get("CW", "0")))
         item.setTextAlignment(0x0002)

{not1mm-25.3.26.dist-info → not1mm-25.3.27.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.3.26
+Version: 25.3.27.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -247,6 +247,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [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.26.dist-info → not1mm-25.3.27.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=kpJ-oyLzUEyx4xEQwO7rFCnVybOnY7RJYXqjym79YBA,151784
+not1mm/__main__.py,sha256=4F_3aJ93ohTMHESKtGcLAwLeZwAgHLJrpeigmQSwMX4,152382
 not1mm/bandmap.py,sha256=mdSK6oj8plEmr6WVYkzPTCfsHWKl9lea3R14cmRsAI4,31531
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -8,7 +8,7 @@ not1mm/lookupservice.py,sha256=GkY_qHZfrW6XHf8upIoaG4hCFqm0fg6Ganu9ConGrIc,2628
 not1mm/radio.py,sha256=_b-tSFuDLoBKnABxrsafGQu2p33U-KOubY7-qgLV2yg,5408
 not1mm/ratewindow.py,sha256=UVkQt0nSB2COQlJQV6tFtsz4mP7d-Wj9jcjqvZw934Q,9891
 not1mm/rtc_service.py,sha256=axAwnCBuTr-QL0YwXtWvg9tjwhcFsiiEZFgFjOofX6k,2816
-not1mm/statistics.py,sha256=vZ76iaMZQLgOriKAg9SicmA_Y9qdiqHJ2T7IoOO5iXo,9620
+not1mm/statistics.py,sha256=N7PaE0yzdYpysEDioaZ_-aYb3bJd_qVCBTExCQNXkd4,9800
 not1mm/test.py,sha256=RN71m2S9MPIOJMaoCi0wZhwEhpEZunvtosZxaKahRB4,101
 not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
 not1mm/voice_keying.py,sha256=HZImqC5NgnyW2nknNYQ3b7I8-6S_hxpq5G4RcIRXn_k,3005
@@ -33,7 +33,7 @@ not1mm/data/k6gte.not1mm-32.png,sha256=XdTsCa3xqwTfn26Ga7RwO_Vlbg_77RKkSc8bMxVcC
 not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N90,2925
 not1mm/data/logwindow.ui,sha256=f7vULj96tHIQuR1nJMyvPHHcmVgzkhv9D1isyojsnFU,1458
 not1mm/data/logwindowx.ui,sha256=CwpI-h7cI1yqyldH9quKftsdHL5lTyL9ABOcf80nfqc,1632
-not1mm/data/main.ui,sha256=-yhNNnaqYiAXueK4wKg3qn4tqo4EUlcSm88qQfXUVOM,63800
+not1mm/data/main.ui,sha256=7H38twKBpL8ZX4rrPCg4XQH1fRIiaVFE7t_yWxygS9Y,63824
 not1mm/data/new_contest.ui,sha256=m41EGeg1yPSUZAkF8jA2z1EKytZD9hZYiQDh1sjE2ac,24602
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=QDicqAk2lORG2UWsHa6jHlsGn6uzrrI2R4HSAocpPes,2258
@@ -118,7 +118,7 @@ not1mm/lib/plugin_common.py,sha256=D1OBjyLmX7zuSPqgTCmHwXzAKA12J_zTQItvyIem-4Y,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=mXffn8Xaj5KATPQinNBR0V5DbHWQPsRfh24_axWGYuk,15254
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=VtZWMGr7eyJr4aR2JSVUkEKeiMYRhbtGhdYbGR4TUmc,48
+not1mm/lib/version.py,sha256=hzhmDpg6V814LRIVpDInIjIiLXs3WT0G4OGJZYRtwKI,50
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
 not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -173,9 +173,9 @@ not1mm/plugins/ref_ssb.py,sha256=cUFUtbe7-5rwZZHEzpPnaIAnwrwayqBvtgctxQDF5Gw,215
 not1mm/plugins/stew_perry_topband.py,sha256=3U-Dr28haBTqTaZWLiC1qHQBmLsLENDL-ihyddPpJbg,15403
 not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
 not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
-not1mm-25.3.26.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.3.26.dist-info/METADATA,sha256=ctRZxwTGcU_OPyasV_iuRKVGNtp1Vw6R9lz7HXPsURI,37470
-not1mm-25.3.26.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-not1mm-25.3.26.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.3.26.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.3.26.dist-info/RECORD,,
+not1mm-25.3.27.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.3.27.1.dist-info/METADATA,sha256=wok0rqACW0QOpGjs6-9ZAATrgENBSTEpMlwHvPLSGK4,37564
+not1mm-25.3.27.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+not1mm-25.3.27.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.3.27.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.3.27.1.dist-info/RECORD,,