not1mm 24.3.27__py3-none-any.whl → 24.4.1.1__py3-none-any.whl

not1mm/__main__.py

@@ -1366,9 +1366,7 @@ class MainWindow(QtWidgets.QMainWindow):
     def launch_log_window(self) -> None:
         """Launch the log window"""
         if not self.log_window:
-            log_widget = LogWindow()
-            self.log_window = QDockWidget(log_widget.property("windowTitle"), self)
-            self.log_window.setWidget(log_widget)
+            self.log_window = LogWindow()
             self.addDockWidget(Qt.BottomDockWidgetArea, self.log_window)
         self.log_window.show()
 
@@ -1382,18 +1380,14 @@ class MainWindow(QtWidgets.QMainWindow):
     def launch_check_window(self) -> None:
         """Launch the check window"""
         if not self.check_window:
-            check_widget = CheckWindow()
-            self.check_window = QDockWidget(check_widget.property("windowTitle"), self)
-            self.check_window.setWidget(check_widget)
+            self.check_window = CheckWindow()
             self.addDockWidget(Qt.RightDockWidgetArea, self.check_window)
         self.check_window.show()
 
     def launch_vfo(self) -> None:
         """Launch the VFO window"""
         if not self.vfo_window:
-            vfo_widget = VfoWindow()
-            self.vfo_window = QDockWidget(vfo_widget.property("windowTitle"), self)
-            self.vfo_window.setWidget(vfo_widget)
+            self.vfo_window = VfoWindow()
             self.addDockWidget(Qt.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.show()
 

not1mm/checkwindow.py

@@ -10,11 +10,12 @@ import os
 import platform
 import queue
 from json import loads
+import Levenshtein
 
 from PyQt5 import QtGui, uic
 from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QListWidgetItem
-from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QLabel, QVBoxLayout, QWidget, QDockWidget
+from PyQt5.QtGui import QMouseEvent
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.database import DataBase
@@ -24,12 +25,21 @@ from not1mm.lib.super_check_partial import SCP
 logger = logging.getLogger(__name__)
 
 
-class CheckWindow(QWidget):
+class CheckWindow(QDockWidget):
     """The check window. Shows list or probable stations."""
 
     multicast_interface = None
     dbname = None
     pref = {}
+    call = None
+    masterLayout: QVBoxLayout = None
+    dxcLayout: QVBoxLayout = None
+    qsoLayout: QVBoxLayout = None
+
+    character_remove_color = "#cc3333"
+    character_add_color = "#3333cc"
+
+    masterScrollWidget: QWidget = None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -42,15 +52,6 @@ class CheckWindow(QWidget):
 
         uic.loadUi(fsutils.APP_DATA_PATH / "checkwindow.ui", self)
 
-        self.logList.clear()
-        self.logList.itemClicked.connect(self.item_clicked)
-        self.masterList.clear()
-        self.masterList.itemClicked.connect(self.item_clicked)
-        self.telnetList.clear()
-        self.telnetList.itemClicked.connect(self.item_clicked)
-        self.callhistoryList.clear()
-        self.callhistoryList.hide()
-        self.callhistoryListLabel.hide()
         self.mscp = SCP(fsutils.APP_DATA_PATH)
         self._udpwatch = None
         self.udp_fifo = queue.Queue()
@@ -67,7 +68,7 @@ class CheckWindow(QWidget):
             cmd = {}
             cmd["cmd"] = "CHANGECALL"
             cmd["station"] = platform.node()
-            cmd["call"] = item.text()
+            cmd["call"] = item
             self.multicast_interface.send_as_json(cmd)
 
     def setDarkMode(self, dark: bool):
@@ -99,6 +100,7 @@ class CheckWindow(QWidget):
             )
 
             self.setPalette(darkPalette)
+            # self.CheckPartialWindow.setPalette(darkPalette)
         else:
             palette = self.style().standardPalette()
             self.setPalette(palette)
@@ -151,11 +153,12 @@ class CheckWindow(QWidget):
                 self.clear_lists()
             if json_data.get("cmd", "") == "CALLCHANGED":
                 call = json_data.get("call", "")
+                self.call = call
                 self.master_list(call)
                 self.log_list(call)
                 continue
             if json_data.get("cmd", "") == "CHECKSPOTS":
-                self.telnetList.clear()
+                self.populate_layout(self.dxcLayout, [])
                 spots = json_data.get("spots", [])
                 self.telnet_list(spots)
                 continue
@@ -178,10 +181,9 @@ class CheckWindow(QWidget):
         -------
         None
         """
-        self.logList.clear()
-        self.masterList.clear()
-        self.telnetList.clear()
-        self.callhistoryList.clear()
+        self.populate_layout(self.masterLayout, [])
+        self.populate_layout(self.qsoLayout, [])
+        self.populate_layout(self.dxcLayout, [])
 
     def master_list(self, call: str) -> None:
         """
@@ -196,14 +198,9 @@ class CheckWindow(QWidget):
         -------
         None
         """
+        self.populate_layout(self.masterLayout, [])
         results = self.mscp.super_check(call)
-        self.masterList.clear()
-        for item in results:
-            if "#" in item:
-                continue
-            listItem = QListWidgetItem(item)
-            self.masterList.addItem(listItem)
-            self.masterList.show()
+        self.populate_layout(self.masterLayout, filter(lambda x: "#" not in x, results))
 
     def log_list(self, call: str) -> None:
         """
@@ -218,13 +215,10 @@ class CheckWindow(QWidget):
         -------
         None
         """
-        self.logList.clear()
+        self.populate_layout(self.qsoLayout, [])
         if call:
             result = self.database.get_like_calls_and_bands(call)
-            for calls in result:
-                listItem = QListWidgetItem(calls)
-                self.logList.addItem(listItem)
-                self.logList.show()
+            self.populate_layout(self.qsoLayout, result)
 
     def telnet_list(self, spots: list) -> None:
         """
@@ -239,10 +233,62 @@ class CheckWindow(QWidget):
         -------
         None
         """
-        self.telnetList.clear()
+        self.populate_layout(self.dxcLayout, [])
         if spots:
-            for calls in spots:
-                call = calls.get("callsign", "")
-                listItem = QListWidgetItem(call)
-                self.telnetList.addItem(listItem)
-                self.telnetList.show()
+            self.populate_layout(
+                self.dxcLayout,
+                filter(lambda x: x, [x.get("callsign", None) for x in spots]),
+            )
+
+    def populate_layout(self, layout, call_list):
+        for i in reversed(range(layout.count())):
+            if layout.itemAt(i).widget():
+                layout.itemAt(i).widget().setParent(None)
+            else:
+                layout.removeItem(layout.itemAt(i))
+        labels = []
+        for call in call_list:
+            if call:
+                if self.call:
+                    label_text = ""
+                    for tag, i1, i2, j1, j2 in Levenshtein.opcodes(call, self.call):
+                        # logger.debug('{:7}   a[{}:{}] --> b[{}:{}] {!r:>8} --> {!r}'.format(
+                        #    tag, i1, i2, j1, j2, call[i1:i2], self.call[j1:j2]))
+                        if tag == "equal":
+                            label_text += call[i1:i2]
+                            continue
+                        elif tag == "replace":
+                            label_text += f"<span style='background-color: {self.character_remove_color};'>{call[i1:i2]}</span>"
+                        elif tag == "insert" or tag == "delete":
+                            label_text += f"<span style='background-color: {self.character_add_color};'>{call[i1:i2]}</span>"
+                    labels.append(
+                        (
+                            Levenshtein.hamming(call, self.call),
+                            CallLabel(
+                                label_text, call=call, callback=self.item_clicked
+                            ),
+                        )
+                    )
+
+        for _, label in sorted(labels, key=lambda x: x[0]):
+            layout.addWidget(label)
+        # top aligns
+        layout.addStretch(0)
+
+
+class CallLabel(QLabel):
+    call: str = None
+
+    def __init__(
+        self,
+        *args,
+        call=None,
+        callback=None,
+    ):
+        super().__init__(*args)
+        self.call = call
+        self.callback = callback
+
+    def mouseDoubleClickEvent(self, e: QMouseEvent) -> None:
+        if self.call and self.callback:
+            self.callback(self.call)

not1mm/data/checkwindow.ui

@@ -1,119 +1,171 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>CheckWindow</class>
- <widget class="QWidget" name="CheckWindow">
+ <class>CheckPartialWindow</class>
+ <widget class="QDockWidget" name="CheckPartialWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>310</width>
-    <height>600</height>
+    <width>322</width>
+    <height>374</height>
    </rect>
   </property>
   <property name="font">
    <font>
     <family>JetBrains Mono</family>
-    <pointsize>12</pointsize>
    </font>
   </property>
+  <property name="focusPolicy">
+   <enum>Qt::NoFocus</enum>
+  </property>
   <property name="windowTitle">
-   <string>Check Partial</string>
+   <string>CheckPartial</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>2</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
-    <number>2</number>
-   </property>
-   <item row="1" column="1">
-    <widget class="QListWidget" name="masterList">
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3">
-    <widget class="QListWidget" name="callhistoryList">
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QListWidget" name="telnetList">
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QListWidget" name="logList">
-     <property name="focusPolicy">
-      <enum>Qt::NoFocus</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="logListLabel">
-     <property name="font">
-      <font>
-       <family>JetBrains Mono</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Log</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLabel" name="masterListLabel">
-     <property name="font">
-      <font>
-       <family>JetBrains Mono</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Master</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="QLabel" name="telnetListLabel">
-     <property name="font">
-      <font>
-       <family>JetBrains Mono</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Telnet</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3">
-    <widget class="QLabel" name="callhistoryListLabel">
-     <property name="font">
-      <font>
-       <family>JetBrains Mono</family>
-       <pointsize>10</pointsize>
-      </font>
-     </property>
-     <property name="text">
-      <string>Call</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
+  <widget class="QWidget" name="widget">
+   <layout class="QGridLayout" name="checkpartialgridlayout">
+    <property name="margin" stdset="0">
+     <number>2</number>
+    </property>
+    <item row="1" column="1">
+     <widget class="QScrollArea" name="masterAreaScroll">
+      <property name="focusPolicy">
+       <enum>Qt::ClickFocus</enum>
+      </property>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustToContents</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="masterScrollWidget">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>96</width>
+         <height>308</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="masterLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="margin" stdset="0">
+         <number>0</number>
+        </property>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <widget class="QScrollArea" name="dxcAreaScroll">
+      <property name="focusPolicy">
+       <enum>Qt::ClickFocus</enum>
+      </property>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustToContents</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="dxcScrollWidget">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>95</width>
+         <height>308</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="dxcLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="margin" stdset="0">
+         <number>0</number>
+        </property>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QScrollArea" name="qsoAreaScroll">
+      <property name="focusPolicy">
+       <enum>Qt::ClickFocus</enum>
+      </property>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustToContents</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="qsoScrollWidget">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>95</width>
+         <height>308</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="qsoLayout">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="margin" stdset="0">
+         <number>0</number>
+        </property>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <widget class="QLabel" name="logListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Log</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="1">
+     <widget class="QLabel" name="masterListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Master</string>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="2">
+     <widget class="QLabel" name="telnetListLabel">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+        <pointsize>10</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>DXC</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
+ <tabstops>
+  <tabstop>dxcAreaScroll</tabstop>
+  <tabstop>qsoAreaScroll</tabstop>
+  <tabstop>masterAreaScroll</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

not1mm/data/logwindow.ui

@@ -1,65 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>LogWindow</class>
- <widget class="QWidget" name="LogWindow">
+ <class>DockWidget</class>
+ <widget class="QDockWidget" name="DockWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>825</width>
-    <height>392</height>
+    <width>818</width>
+    <height>374</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>QSO Logs</string>
+   <string>DockWidget</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>2</number>
-   </property>
-   <property name="topMargin">
-    <number>2</number>
-   </property>
-   <property name="rightMargin">
-    <number>2</number>
-   </property>
-   <property name="bottomMargin">
-    <number>2</number>
-   </property>
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <widget class="QTableWidget" name="generalLog">
-      <property name="font">
-       <font>
-        <family>JetBrains Mono</family>
-       </font>
-      </property>
-      <property name="focusPolicy">
-       <enum>Qt::NoFocus</enum>
-      </property>
-      <property name="tabKeyNavigation">
-       <bool>false</bool>
-      </property>
-     </widget>
-     <widget class="QTableWidget" name="focusedLog">
-      <property name="font">
-       <font>
-        <family>JetBrains Mono</family>
-       </font>
-      </property>
-      <property name="focusPolicy">
-       <enum>Qt::NoFocus</enum>
-      </property>
-      <property name="tabKeyNavigation">
-       <bool>false</bool>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
       </property>
+      <widget class="QTableWidget" name="generalLog">
+       <property name="font">
+        <font>
+         <family>JetBrains Mono</family>
+        </font>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="tabKeyNavigation">
+        <bool>false</bool>
+       </property>
+      </widget>
+      <widget class="QTableWidget" name="focusedLog">
+       <property name="font">
+        <font>
+         <family>JetBrains Mono</family>
+        </font>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="tabKeyNavigation">
+        <bool>false</bool>
+       </property>
+      </widget>
      </widget>
-    </widget>
-   </item>
-  </layout>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <resources/>
  <connections/>

not1mm/data/logwindowx.ui

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LogWindow</class>
+ <widget class="QWidget" name="LogWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>825</width>
+    <height>392</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>QSO Logs</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <widget class="QTableWidget" name="generalLog">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+       </font>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="tabKeyNavigation">
+       <bool>false</bool>
+      </property>
+     </widget>
+     <widget class="QTableWidget" name="focusedLog">
+      <property name="font">
+       <font>
+        <family>JetBrains Mono</family>
+       </font>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="tabKeyNavigation">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

not1mm/data/vfo.ui

@@ -1,83 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>VfoWindow</class>
- <widget class="QWidget" name="VfoWindow">
+ <class>DockWidget</class>
+ <widget class="QDockWidget" name="DockWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>570</width>
-    <height>130</height>
+    <width>304</width>
+    <height>132</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>DockWidget</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0">
-    <widget class="QMenuBar" name="menubar"/>
-   </item>
-   <item row="1" column="0">
-    <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QFrame" name="frame">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_2">
-        <item row="0" column="0">
-         <widget class="QLCDNumber" name="lcdNumber">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>25</pointsize>
-           </font>
-          </property>
-          <property name="autoFillBackground">
-           <bool>false</bool>
-          </property>
-          <property name="smallDecimalPoint">
-           <bool>false</bool>
-          </property>
-          <property name="digitCount">
-           <number>11</number>
-          </property>
-          <property name="mode">
-           <enum>QLCDNumber::Dec</enum>
-          </property>
-          <property name="segmentStyle">
-           <enum>QLCDNumber::Flat</enum>
-          </property>
-          <property name="intValue" stdset="0">
-           <number>14032000</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
-  <action name="actionQuit">
-   <property name="text">
-    <string>Quit</string>
-   </property>
-  </action>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QGridLayout" name="gridLayout_2">
+    <item row="0" column="0">
+     <widget class="QFrame" name="frame">
+      <property name="frameShape">
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow">
+       <enum>QFrame::Raised</enum>
+      </property>
+      <layout class="QGridLayout" name="gridLayout">
+       <item row="0" column="0">
+        <widget class="QLCDNumber" name="lcdNumber">
+         <property name="font">
+          <font>
+           <pointsize>25</pointsize>
+          </font>
+         </property>
+         <property name="digitCount">
+          <number>11</number>
+         </property>
+         <property name="segmentStyle">
+          <enum>QLCDNumber::Flat</enum>
+         </property>
+         <property name="intValue" stdset="0">
+          <number>14032000</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <resources/>
  <connections/>

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.3.27"
+__version__ = "24.4.1.1"

not1mm/logwindow.py

@@ -16,6 +16,7 @@ from json import loads
 import math
 from PyQt5 import QtCore, QtGui, QtWidgets, uic
 from PyQt5.QtCore import Qt, QItemSelectionModel
+from PyQt5.QtWidgets import QDockWidget
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.database import DataBase
@@ -51,7 +52,7 @@ def safe_float(the_input: any, default=0.0) -> float:
     return default
 
 
-class LogWindow(QtWidgets.QWidget):
+class LogWindow(QDockWidget):
     """
     The main window
     """

not1mm/vfo.py

@@ -16,7 +16,7 @@ from json import loads, JSONDecodeError
 import serial
 from PyQt5 import QtCore, QtGui, QtWidgets, uic
 from PyQt5.QtCore import Qt, QTimer
-from PyQt5.QtWidgets import QWidget
+from PyQt5.QtWidgets import QWidget, QDockWidget
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.cat_interface import CAT
@@ -25,7 +25,7 @@ from not1mm.lib.multicast import Multicast
 logger = logging.getLogger(__name__)
 
 
-class VfoWindow(QWidget):
+class VfoWindow(QDockWidget):
     """The VFO window."""
 
     pref = {}

{not1mm-24.3.27.dist-info → not1mm-24.4.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.3.27
+Version: 24.4.1.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -28,6 +28,7 @@ Requires-Dist: numpy
 Requires-Dist: notctyparser >=23.6.21
 Requires-Dist: rapidfuzz
 Requires-Dist: appdata
+Requires-Dist: Levenshtein
 
 # Not1MM
 
@@ -48,20 +49,20 @@ The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<
   - [Our Code Contributors ✨](#our-code-contributors-)
   - [List of should be working contests](#list-of-should-be-working-contests)
   - [Recent Changes](#recent-changes)
+  - [Flatpak](#flatpak)
   - [Installation](#installation)
     - [Prerequisites](#prerequisites)
-    - [Common recipes for Ubuntu and Fedora](#common-recipes-for-ubuntu-and-fedora)
+    - [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)
       - [Fedora 38 \& 39](#fedora-38--39)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
-    - [Bootstrapping pipx](#bootstrapping-pipx)
-    - [Installing with pipx](#installing-with-pipx)
+      - [Bootstrapping pipx](#bootstrapping-pipx)
+      - [Installing with pipx](#installing-with-pipx)
   - [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)
-    - [Running from source](#running-from-source)
-  - [Wayland Compositor](#wayland-compositor)
+    - [Installing from GitHub source](#installing-from-github-source)
   - [Various data file locations](#various-data-file-locations)
     - [Data](#data)
     - [Config](#config)
@@ -90,25 +91,22 @@ The worlds #1 unfinished contest logger <sup>*According to my daughter Corinna.<
     - [Macro use with voice](#macro-use-with-voice)
   - [cty.dat and QRZ lookups for distance and bearing](#ctydat-and-qrz-lookups-for-distance-and-bearing)
   - [Other uses for the call field](#other-uses-for-the-call-field)
-  - [Windows](#windows)
+  - [The Windows](#the-windows)
     - [The Main Window](#the-main-window)
-    - [Keyboard commands](#keyboard-commands)
-    - [Log Display](#log-display)
+      - [Keyboard commands](#keyboard-commands)
+    - [The Log Window](#the-log-window)
       - [Editing a contact](#editing-a-contact)
-  - [Recalulate Mults](#recalulate-mults)
-  - [Bandmap](#bandmap)
-  - [Check Window](#check-window)
-  - [Remote VFO](#remote-vfo)
+    - [The Bandmap Window](#the-bandmap-window)
+    - [The Check Window](#the-check-window)
+    - [The Remote VFO Window](#the-remote-vfo-window)
   - [Cabrillo](#cabrillo)
   - [ADIF](#adif)
-  - [Dupe checking](#dupe-checking)
+  - [Recalulate Mults](#recalulate-mults)
   - [Contest specific notes](#contest-specific-notes)
     - [ARRL Sweekstakes](#arrl-sweekstakes)
       - [The exchange parser](#the-exchange-parser)
       - [The exchange](#the-exchange)
 
-[Visit the Wiki](https://github.com/mbridak/not1mm/wiki/Not1MM)
-
 ## What and why is Not1MM
 
 Not1MM's interface is a blatant ripoff of N1MM. It is NOT N1MM and any problem
@@ -179,24 +177,18 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-3-27] Made items in the checkwindow clickable. Removed connection check in bandmap preventing marked calls from appearing.
-- [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.
-- [24-3-23] Yanked version 24-3-21, too many bugs for existing userbase.
-- [24-3-21] Merged PR from @kyleboyle for docking windows. MacOS and Windows support.
-- [24-3-19] Removed some useless bloat causing slow interface on FreeBSD 13/14 and maybe others.
-- [24-3-16] Add Save/Fail confirmation dialogs when saving ADIF of Cabrillo files.
-- [24-3-15] Change 'CWR' to 'CW' in the ADIF output.
-- [24-3-13] Added CQ 160 CW and SSB
-- [24-3-9] Marked calls in the bandmap window colored Blue, until worked.
-- [24-3-7] Merged PR from @arodland for faster fuzzy SCP lookups.
-- [24-3-2-1] Added marking stations on the bandmap to work later with CTRL-M.
-- [24-3-2] Merged PR from @arodland for fuzzy SCP lookup.
+- [24-4-1-1] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets.
+- [24-4-1] Removed some un-needed loops and widgets from the check window.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
+## Flatpak
+
+I've tried for a couple days to get not1mm to build as a flatpak. I've failed.
+It keeps failing at building numpy. If you happen to be a flatpak savant, please
+feel free to look at com.github.mbridak.not1mm.yaml and python3-modules.yaml and
+clue me into the black magic needed to get it to work.
+
 ## Installation
 
 ### Prerequisites
@@ -204,7 +196,10 @@ See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 not1mm requires Python 3.9+, PyQt5 and libportaudio2. You should install these
 through your distribution's package manager before continuing.
 
-### Common recipes for Ubuntu and Fedora
+### Common installation recipes for Ubuntu and Fedora
+
+I've taken the time to install some common Linux distributions into a VM and
+noted the minimum steps needed to install not1mm.
 
 #### Ubuntu 22.04 LTS
 
@@ -252,7 +247,7 @@ Linux distros will make you do this unless you include a command line argument
 akin to '--break-my-system' when using pip. I'm not telling you to use pipx.
 But... **Use pipx**.
 
-### Bootstrapping pipx
+#### Bootstrapping pipx
 
 Assuming you have only Python installed, your path to pipx is:
 
@@ -268,7 +263,7 @@ python3 -m pip install --user pipx
 python3 -m pipx ensurepath
 ```
 
-### Installing with pipx
+#### Installing with pipx
 
 Then installing not1mm is as simple as:
 
@@ -315,7 +310,7 @@ 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.
 
-### Running from source
+### 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:
@@ -344,13 +339,6 @@ or be in some other directory and just type:
 not1mm
 ```
 
-## Wayland Compositor
-
-One side effect of Wayland is that we are not able to request for a window to
-regain or retain focus. So if you were to click on a spot in the bandmap window
-to tune to that spot, you would have to then click on the main window to
-continue entering contest data. I'm aware of this, but I can not change it.
-
 ## Various data file locations
 
 ### Data
@@ -562,13 +550,13 @@ is this has happened, since the gridsquare will replace the word "Regional".
 
 **You must press the SPACE bar after entering any of the above.**
 
-## Windows
+## The Windows
 
 ### The Main Window
 
 ![Main screen with callouts](https://github.com/mbridak/not1mm/raw/master/pic/mainwithcallouts.png)
 
-### Keyboard commands
+#### Keyboard commands
 
 | Key | Result |
 | -------------- | --- |
@@ -588,7 +576,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |
 | [CTRL-SHIFT-K] | Open CW text input field. |
 
-### Log Display
+### The Log Window
 
 `Window`>`Log Window`
 
@@ -615,13 +603,7 @@ You can not directly edit the multiplier status of a contact. Instead see the
 next section on recalculating mults. If you change the callsign make sure the
 `WPX` field is still valid.
 
-## Recalulate Mults
-
-After editing a contact and before generating a Cabrillo file. There is a Misc
-menu option that will recalculate the multipliers incase an edit had caused a
-change.
-
-## Bandmap
+### The Bandmap Window
 
 `Window`>`Bandmap`
 
@@ -640,7 +622,7 @@ blue rectangle shows the receivers bandwidth if one is reported.
 Clicked on spots now tune the radio and set the callsign field. Previously
 worked calls are displayed in red.
 
-## Check Window
+### The Check Window
 
 `Window`>`Check Window`
 
@@ -654,7 +636,7 @@ Clicking on any of these items will change the callsign field.
 
 ![Check Window](https://github.com/mbridak/not1mm/raw/master/pic/checkwindow.png)
 
-## Remote VFO
+### The Remote VFO Window
 
 You can control the VFO on a remote rig by following the directions listed in
 the link below. It's a small hardware project with a BOM of under $20, and
@@ -690,9 +672,11 @@ Boom... ADIF
 
 `StationCall`\_`ContestName`\_`Date`\_`Time`.adi
 
-## Dupe checking
+## Recalulate Mults
 
-Added dupe checking. Big Red 'Dupe' will appear if it's a dupe...
+After editing a contact and before generating a Cabrillo file. There is a Misc
+menu option that will recalculate the multipliers incase an edit had caused a
+change.
 
 ## Contest specific notes
 

{not1mm-24.3.27.dist-info → not1mm-24.4.1.1.dist-info}/RECORD

@@ -1,17 +1,17 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=GhgvGedPUhRoahp924Qi6fAwbenCmuJXiE5F5pyuRHg,118379
+not1mm/__main__.py,sha256=y7pJidcDn71lr-JLfZPQSqPDNgbrImeIgKgvJNhVrb8,117984
 not1mm/bandmap.py,sha256=a0QZj0HvPh8ixj207ANRHO29aKN3YMKolp_P47gSOtI,33404
-not1mm/checkwindow.py,sha256=TZbeX7IQCoKV8mKoB6HWUOZz6XxpDW7Vb3GvpDfehFs,7850
+not1mm/checkwindow.py,sha256=3m3rYItlWtbnRWxI_k1ECmweuVJtf0W2tU1NjL6a8FU,9657
 not1mm/fsutils.py,sha256=Li8Tq9K7c_q7onOHOQ7u1dOOFfhIIz5Aj2LKuQtGOO4,1652
-not1mm/logwindow.py,sha256=2uy3oduImH1QNz5tBBrevsk7iMoYCUOTO7ttf92zN5w,43830
-not1mm/vfo.py,sha256=ghtTmkhrug8YxYXUlJZOk7wN8jR8XNZKYTrcs4-E4rw,11530
+not1mm/logwindow.py,sha256=weejWrd-yo6SXX48sr2cjuIe_L-1hnba896A6hxv-EE,43864
+not1mm/vfo.py,sha256=cEu8hjD3fZ6gfKOOFqoy9WVMFOOmOC9ab-x_6Wwzp4w,11547
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=1vQRvEZ865brfmmajp-Lj-hgWejVGI992q8o971bUV8,366478
 not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
 not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6u5LUIqAYidOQ,224
 not1mm/data/bandmap.ui,sha256=NqVoAGyuf_Rsts_FnL0pYEtE08DJb6qm4KAQ_T01bM8,7125
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
-not1mm/data/checkwindow.ui,sha256=UTyQ_aTh1Y8qR2XM2CC5xoKK9PkWfFxuEC55Msc_lhc,2912
+not1mm/data/checkwindow.ui,sha256=0e8CqRy5yXLwAi_SRfYh4X1efz2IHzqLWUJPgNrjDDg,4611
 not1mm/data/configuration.ui,sha256=DJZxA4zZPb4sTdVn17j1fwaTw-5lJCNQ6PspQrsdMe4,51643
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=CGf_bvqr_qfr0kXLQC0JGW1BWSX-1Ce8qZwDMMN7tuM,4783134
@@ -24,7 +24,8 @@ not1mm/data/k6gte-not1mm.desktop,sha256=bSiSG7PzGygv0bBaF7Nf48PApVyrobSBVNk7j7wR
 not1mm/data/k6gte.not1mm-128.png,sha256=ZP93MfRqr4WwsFCwg1m5MZjLs8bG895vDW9DDDn1B_Q,6076
 not1mm/data/k6gte.not1mm-32.png,sha256=XdTsCa3xqwTfn26Ga7RwO_Vlbg_77RKkSc8bMxVcCac,1526
 not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N90,2925
-not1mm/data/logwindow.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
+not1mm/data/logwindow.ui,sha256=vfkNdzJgFs3tTOBKLDavF2zVMvNHWOZ82fAErRi6pQY,1436
+not1mm/data/logwindowx.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
 not1mm/data/main.ui,sha256=X9sNqSZyKennX-7Ne4c8yLnkbN13T5YpDUeri-wPOn4,54070
 not1mm/data/new_contest.ui,sha256=Xubngdbs_V_-o8huXzKOOaQOfj1NSXu9giIcaL4d0qk,21823
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
@@ -36,7 +37,7 @@ not1mm/data/radio_red.png,sha256=QvkMk7thd_hCEIyK5xGAG4xVVXivl39nwOfD8USDI20,957
 not1mm/data/reddot.png,sha256=M33jEMoU8W4rQ4_MVyzzKxDPDte1ypKBch5VnUMNLKE,565
 not1mm/data/settings.ui,sha256=7r4aZwxKUHQGm8NLQGLINurGMvT_5VMU9p2dznW25bA,40028
 not1mm/data/ssbmacros.txt,sha256=0Qccj4y0nlK-w5da9a9ti-jILkURtwztoDuL_D0pEJM,470
-not1mm/data/vfo.ui,sha256=f18m5r3gMbm0xtPJAZH1qVvOggK24XKBL7OGmip_Ks8,2405
+not1mm/data/vfo.ui,sha256=Fp_2lFrZgaLx0PZS8_JeoH4zKCCA4LUNtK3wmlyrztM,1413
 not1mm/data/phonetics/0.wav,sha256=0OpYiR-3MK6fVHE6MB-HeOxSAPiDNMjqvx5JcIZtsQk,42590
 not1mm/data/phonetics/1.wav,sha256=OEAavA8cfVxFZwaT0HY9Wg9NAGEPKBhwhEdzGXkQs_U,30248
 not1mm/data/phonetics/2.wav,sha256=AmCfvo8y8BT9OlHkCs_N4y_mUAjmyG_x9ahbgiwU2FE,29584
@@ -103,7 +104,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=Ezc7MTZXEbQ_nXK7gmghalqfbbDyxp0pAVt0-chBJOw,359
 not1mm/lib/settings.py,sha256=9dyXiUZcrR57EVemGDrO2ad3HSMQbe5ngl_bxtZtEic,8877
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=IpjqBMjJNDsk2O3WzC_DpJzHa21DCNn_zNQC9cgEwlg,48
+not1mm/lib/version.py,sha256=gUR6aMT2qsB4VwR9eK35GmjHRw6xQLgG3L0-5h8FX3k,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=pG0cFmTNOFO03wXcI1a3EEaT1QK83yWIsrSdqCOU-gg,10834
 not1mm/plugins/10_10_spring_cw.py,sha256=aWTohVrnZpT0SlQuqq7zxQaYe4SExEkOl3NI8xYYJWI,10840
@@ -137,9 +138,9 @@ not1mm/plugins/naqp_ssb.py,sha256=pof1k6Eg_MDQXSaCOJLh1jfVyyIri0LdHYrZQu7P_gs,11
 not1mm/plugins/phone_weekly_test.py,sha256=EfLQzKREEXO_Ljg-q3VWg87JfbPVar9ydNhCdmHCrt8,12278
 not1mm/plugins/stew_perry_topband.py,sha256=bjcImkZhBXpw4XKogs85mpShz7QgYbVohvhFMQ050DI,10546
 not1mm/plugins/winter_field_day.py,sha256=7JK-RS1abcj1xQLnTF8rIPHRpDzmp4sAFBBML8b-Lwk,10212
-not1mm-24.3.27.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.3.27.dist-info/METADATA,sha256=9fH5dH0rYoyFXAwpZrm5xWOC9Y6HmprnJ5dAYBh4Z80,27117
-not1mm-24.3.27.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.3.27.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.3.27.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.3.27.dist-info/RECORD,,
+not1mm-24.4.1.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.1.1.dist-info/METADATA,sha256=9ECpINXJHA12eRbjp-kpDxqeabQm-k9Hh-j6sry8GbU,26391
+not1mm-24.4.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.1.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.1.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.1.1.dist-info/RECORD,,