not1mm 25.3.31__tar.gz → 25.4.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.3.31
+Version: 25.4.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -247,23 +247,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [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.
-- [25-3-24] Add CW, PH, DI counts to the statistics window.
-- [25-3-23] Add a statistics window.
-- [25-3-19-1] Add EA His Maj King of Spain SSB.
-- [25-3-19] Merged PR from @DD5ML Adding DARC VHF.
-- [25-3-18] Add His Maj King of Spain CW
-- [25-3-17] Add EA RTTY contest.
-- [25-3-14] Add call history support to ARR Field Day.
-- [25-3-10] Slight change to adif header. Slight change to CAT status icon state.
-- [25-3-5] Added checks for blank/comment lines in the macros
-- [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
-- [25-3-1] Add {OTHER1} and {OTHER2} macros.
+- [25-4-1] Fix: statistics window not populating when initially activated from the window menu. Removed unused code chucks. Removed some unused and hidden visual elements.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

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

@@ -215,23 +215,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [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.
-- [25-3-24] Add CW, PH, DI counts to the statistics window.
-- [25-3-23] Add a statistics window.
-- [25-3-19-1] Add EA His Maj King of Spain SSB.
-- [25-3-19] Merged PR from @DD5ML Adding DARC VHF.
-- [25-3-18] Add His Maj King of Spain CW
-- [25-3-17] Add EA RTTY contest.
-- [25-3-14] Add call history support to ARR Field Day.
-- [25-3-10] Slight change to adif header. Slight change to CAT status icon state.
-- [25-3-5] Added checks for blank/comment lines in the macros
-- [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
-- [25-3-1] Add {OTHER1} and {OTHER2} macros.
+- [25-4-1] Fix: statistics window not populating when initially activated from the window menu. Removed unused code chucks. Removed some unused and hidden visual elements.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

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

@@ -1947,6 +1947,7 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.actionStatistics.isChecked():
             self.statistics_window.show()
             self.statistics_window.setActive(True)
+            self.statistics_window.get_run_and_total_qs()
         else:
             self.statistics_window.hide()
             self.statistics_window.setActive(False)

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

@@ -17,7 +17,7 @@ import Levenshtein
 
 from PyQt6 import uic
 from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget, QDockWidget
-from PyQt6.QtGui import QMouseEvent, QColorConstants, QPalette, QColor
+from PyQt6.QtGui import QMouseEvent
 from PyQt6.QtCore import pyqtSignal
 
 import not1mm.fsutils as fsutils
@@ -62,9 +62,7 @@ class CheckWindow(QDockWidget):
 
     def msg_from_main(self, packet):
         """"""
-        if packet.get("cmd", "") == "DARKMODE":
-            self.setDarkMode(packet.get("state", False))
-            return
+
         if packet.get("cmd", "") == "UPDATELOG":
             self.clear_lists()
             return
@@ -97,47 +95,6 @@ class CheckWindow(QDockWidget):
             cmd["call"] = item
             self.message.emit(cmd)
 
-    def setDarkMode(self, dark: bool) -> None:
-        """Forces a darkmode palette."""
-        return
-        if dark:
-            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(
-                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)
-        else:
-            palette = self.style().standardPalette()
-            self.setPalette(palette)
-
     def load_pref(self) -> None:
         """
         Load preference file to get current db filename and sets the initial darkmode state.
@@ -162,7 +119,6 @@ class CheckWindow(QDockWidget):
 
         except IOError as exception:
             logger.critical("Error: %s", exception)
-        self.setDarkMode(self.pref.get("darkmode", False))
 
     def clear_lists(self) -> None:
         """

not1mm-25.4.1/not1mm/data/ratewindow.ui

@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DockWidget</class>
+ <widget class="QDockWidget" name="DockWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>252</width>
+    <height>250</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>200</height>
+   </size>
+  </property>
+  <property name="font">
+   <font>
+    <family>JetBrains Mono ExtraLight</family>
+   </font>
+  </property>
+  <property name="windowTitle">
+   <string>RateWindow</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="sizeConstraint">
+       <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
+      </property>
+      <item>
+       <widget class="QLabel" name="selectors">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <family>JetBrains Mono ExtraLight</family>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="lineWidth">
+         <number>0</number>
+        </property>
+        <property name="text">
+         <string>All bands - All modes</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::TextInteractionFlag::NoTextInteraction</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="sizeConstraint">
+         <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
+        </property>
+        <property name="labelAlignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="formAlignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_2">
+          <property name="minimumSize">
+           <size>
+            <width>112</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="autoFillBackground">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Last Hour:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="textInteractionFlags">
+           <set>Qt::TextInteractionFlag::NoTextInteraction</set>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLabel" name="last_hour">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0 Q/h</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>10 Last QSO:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLabel" name="ten_last_qso">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0 Q/h</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>100 Last QSO:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLabel" name="hundred_last_qso">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0 Q/h</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="since_lasthour_label">
+          <property name="text">
+           <string>Since 1400z:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="since_lasthour">
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0 QSO</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="Line" name="line">
+        <property name="lineWidth">
+         <number>4</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QFormLayout" name="formLayout_3">
+        <property name="sizeConstraint">
+         <enum>QLayout::SizeConstraint::SetMinimumSize</enum>
+        </property>
+        <property name="labelAlignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="formAlignment">
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_14">
+          <property name="minimumSize">
+           <size>
+            <width>112</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Run QSO:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLabel" name="run_qso">
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_16">
+          <property name="text">
+           <string>S&amp;P QSO:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLabel" name="sandp_qso">
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="label_18">
+          <property name="text">
+           <string>   Hour Run QSO:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLabel" name="hour_run_qso">
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="label_17">
+          <property name="text">
+           <string>   Hour S&amp;P QSO:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="hour_sandp_qso">
+          <property name="maximumSize">
+           <size>
+            <width>112</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>0</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

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

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

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

@@ -20,7 +20,6 @@ import math
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QItemSelectionModel
 from PyQt6.QtWidgets import QDockWidget
-from PyQt6.QtGui import QColorConstants, QPalette, QColor
 from PyQt6.QtCore import pyqtSignal
 
 import not1mm.fsutils as fsutils
@@ -193,59 +192,12 @@ class LogWindow(QDockWidget):
                     column = "Freq (Khz)"
                 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:
         """"""
         for i in range(self.generalLog.columnCount()):
             self.focusedLog.setColumnWidth(i, self.generalLog.columnWidth(i))
 
-    def set_dark_mode(self, dark: bool) -> None:
-        """Forces a darkmode palette."""
-        return
-
-        if dark:
-            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(
-                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.current_palette = darkPalette
-        else:
-            palette = self.style().standardPalette()
-            self.setPalette(palette)
-            self.current_palette = palette
-
     def get_column(self, name: str) -> int:
         """
         Returns the column number of the given column name.
@@ -303,7 +255,6 @@ class LogWindow(QDockWidget):
         self.n1mm.send_lookup_packets = self.pref.get("send_n1mm_lookup", False)
         self.n1mm.send_score_packets = self.pref.get("send_n1mm_score", False)
         self.n1mm.radio_info["StationName"] = self.pref.get("n1mm_station_name", "")
-        self.set_dark_mode(self.pref.get("darkmode", False))
 
     def load_new_db(self) -> None:
         """