not1mm 24.7.13__py3-none-any.whl → 24.7.19__py3-none-any.whl

not1mm/__main__.py

@@ -39,7 +39,7 @@ except OSError as exception:
     print("portaudio is not installed")
     sd = None
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
-from PyQt6.QtCore import QDir, Qt, QThread
+from PyQt6.QtCore import QDir, Qt, QThread, QSettings
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QFileDialog
 
@@ -120,10 +120,6 @@ class MainWindow(QtWidgets.QMainWindow):
         "cw_macros": True,
         "bands_modes": True,
         "bands": ["160", "80", "40", "20", "15", "10"],
-        "window_height": 200,
-        "window_width": 600,
-        "window_x": 120,
-        "window_y": 120,
         "current_database": "ham.db",
         "contest": "",
         "multicast_group": "239.1.1.1",
@@ -202,6 +198,14 @@ class MainWindow(QtWidgets.QMainWindow):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         logger.info("MainWindow: __init__")
+
+        self.dock_loc = {
+            "Top": Qt.DockWidgetArea.TopDockWidgetArea,
+            "Right": Qt.DockWidgetArea.RightDockWidgetArea,
+            "Left": Qt.DockWidgetArea.LeftDockWidgetArea,
+            "Bottom": Qt.DockWidgetArea.BottomDockWidgetArea,
+        }
+
         self.setCorner(Qt.Corner.TopRightCorner, Qt.DockWidgetArea.RightDockWidgetArea)
         self.setCorner(
             Qt.Corner.BottomRightCorner, Qt.DockWidgetArea.RightDockWidgetArea
@@ -219,6 +223,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.mscp = SCP(fsutils.APP_DATA_PATH)
         self.next_field = self.other_2
         self.dupe_indicator.hide()
+
         self.cw_speed.valueChanged.connect(self.cwspeed_spinbox_changed)
 
         self.cw_entry.textChanged.connect(self.handle_text_change)
@@ -516,38 +521,47 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.pref.get("contest"):
             self.load_contest()
         self.read_cw_macros()
+
+        self.log_window = LogWindow()
+        self.log_window.setObjectName("log-window")
+        self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
+        self.log_window.hide()
+
+        self.bandmap_window = BandMapWindow()
+        self.bandmap_window.setObjectName("bandmap-window")
+        self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
+        self.bandmap_window.hide()
+
+        self.check_window = CheckWindow()
+        self.check_window.setObjectName("check-window")
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
+        self.check_window.hide()
+
+        self.vfo_window = VfoWindow()
+        self.vfo_window.setObjectName("vfo-window")
+        self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
+        self.vfo_window.hide()
+
+        self.settings = QSettings("K6GTE", "not1mm")
+        if self.settings.value("windowState") is not None:
+            self.restoreState(self.settings.value("windowState"))
+        if self.settings.value("geometry") is not None:
+            self.restoreGeometry(self.settings.value("geometry"))
+
         self.actionLog_Window.setChecked(self.pref.get("logwindow", False))
-        if self.log_window:
-            self.log_window.close()
         if self.actionLog_Window.isChecked():
-            self.log_window = LogWindow()
-            self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
             self.log_window.show()
 
         self.actionBandmap.setChecked(self.pref.get("bandmapwindow", False))
-        if self.bandmap_window:
-            self.bandmap_window.close()
         if self.actionBandmap.isChecked():
-            self.bandmap_window = BandMapWindow()
-            self.addDockWidget(
-                Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window
-            )
             self.bandmap_window.show()
 
         self.actionCheck_Window.setChecked(self.pref.get("checkwindow", False))
-        if self.check_window:
-            self.check_window.close()
         if self.actionCheck_Window.isChecked():
-            self.check_window = CheckWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
             self.check_window.show()
 
         self.actionVFO.setChecked(self.pref.get("vfowindow", False))
-        if self.vfo_window:
-            self.vfo_window.close()
         if self.actionVFO.isChecked():
-            self.vfo_window = VfoWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
             self.vfo_window.show()
 
         if not DEBUG_ENABLED:
@@ -1424,47 +1438,37 @@ class MainWindow(QtWidgets.QMainWindow):
         """Launch the log window"""
         self.pref["logwindow"] = self.actionLog_Window.isChecked()
         self.write_preference()
-        if self.log_window:
-            self.log_window.close()
         if self.actionLog_Window.isChecked():
-            self.log_window = LogWindow()
-            self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
             self.log_window.show()
+        else:
+            self.log_window.hide()
 
     def launch_bandmap_window(self) -> None:
         """Launch the bandmap window"""
         self.pref["bandmapwindow"] = self.actionBandmap.isChecked()
         self.write_preference()
-        if self.bandmap_window:
-            self.bandmap_window.close()
         if self.actionBandmap.isChecked():
-            self.bandmap_window = BandMapWindow()
-            self.addDockWidget(
-                Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window
-            )
             self.bandmap_window.show()
+        else:
+            self.bandmap_window.hide()
 
     def launch_check_window(self) -> None:
         """Launch the check window"""
         self.pref["checkwindow"] = self.actionCheck_Window.isChecked()
         self.write_preference()
-        if self.check_window:
-            self.check_window.close()
         if self.actionCheck_Window.isChecked():
-            self.check_window = CheckWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
             self.check_window.show()
+        else:
+            self.check_window.hide()
 
     def launch_vfo(self) -> None:
         """Launch the VFO window"""
         self.pref["vfowindow"] = self.actionVFO.isChecked()
         self.write_preference()
-        if self.vfo_window:
-            self.vfo_window.close()
         if self.actionVFO.isChecked():
-            self.vfo_window = VfoWindow()
-            self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
             self.vfo_window.show()
+        else:
+            self.vfo_window.hide()
 
     def clear_band_indicators(self) -> None:
         """
@@ -1522,14 +1526,14 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
 
+        self.settings.setValue("geometry", self.saveGeometry())
+        self.settings.setValue("windowState", self.saveState())
+        self.settings.sync()
+
         cmd = {}
         cmd["cmd"] = "HALT"
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
-        self.pref["window_width"] = self.size().width()
-        self.pref["window_height"] = self.size().height()
-        self.pref["window_x"] = self.pos().x()
-        self.pref["window_y"] = self.pos().y()
         self.write_preference()
 
     def cty_lookup(self, callsign: str) -> list:
@@ -3399,11 +3403,11 @@ app = QtWidgets.QApplication(sys.argv)
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
 window = MainWindow()
-height = window.pref.get("window_height", 300)
-width = window.pref.get("window_width", 700)
-x = window.pref.get("window_x", -1)
-y = window.pref.get("window_y", -1)
-window.setGeometry(x, y, width, height)
+# height = window.pref.get("window_height", 300)
+# width = window.pref.get("window_width", 700)
+# x = window.pref.get("window_x", -1)
+# y = window.pref.get("window_y", -1)
+# window.setGeometry(x, y, width, height)
 window.callsign.setFocus()
 window.show()
 # timer = QtCore.QTimer()

not1mm/data/main.ui

@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>878</width>
-    <height>465</height>
+    <width>768</width>
+    <height>265</height>
    </rect>
   </property>
   <property name="sizePolicy">

not1mm/lib/cat_interface.py

@@ -328,10 +328,13 @@ class CAT:
 
     def set_vfo(self, freq: str) -> bool:
         """Sets the radios vfo"""
-        if self.interface == "flrig":
-            return self.__setvfo_flrig(freq)
-        if self.interface == "rigctld":
-            return self.__setvfo_rigctld(freq)
+        try:
+            if self.interface == "flrig":
+                return self.__setvfo_flrig(freq)
+            if self.interface == "rigctld":
+                return self.__setvfo_rigctld(freq)
+        except ValueError:
+            ...
         return False
 
     def __setvfo_flrig(self, freq: str) -> bool:

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.7.13"
+__version__ = "24.7.19"

{not1mm-24.7.13.dist-info → not1mm-24.7.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.13
+Version: 24.7.19
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,6 +223,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-7-19] Use Qt's QSettings to store window and dockwidgets states.
 - [24-7-13] Trap Exceptions in flrig xmlrpc client.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.7.13.dist-info → not1mm-24.7.19.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=OIQmaLr7Fs3ODGt5J0OnUXxArTysREun1A2nRE-5wYU,120737
+not1mm/__main__.py,sha256=yVBck7JN7jIc49RvxkHhMI9QphC85pLufOH7Uul738o,120573
 not1mm/bandmap.py,sha256=Ml5DDoybk_I56q2WLYDKE4lfmh6pb9XxW0qpl5nDFYY,32161
 not1mm/checkwindow.py,sha256=zHxkCQ4BJ-pN80dSTQdiKq8RqY4oWzJveXZhQ2bu3PY,10436
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -29,7 +29,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=vfkNdzJgFs3tTOBKLDavF2zVMvNHWOZ82fAErRi6pQY,1436
 not1mm/data/logwindowx.ui,sha256=9FzDJtLRpagvAWcDjFdB9NnvNZ4bVxdTNHy1Jit2ido,1610
-not1mm/data/main.ui,sha256=l8SpMHLl7Nra3FCZVDQ9H33NUGs4_UY4ttN9omY3Zzw,56506
+not1mm/data/main.ui,sha256=Y8F0gOqMTcsxBmc3QvWkJMxhYFpxUJQl-btGiM1-31w,56506
 not1mm/data/new_contest.ui,sha256=qP4v6el5mZrIuHUcIZXDkNviuGJk09ZtnpwpgxzQ6TY,21928
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
@@ -91,7 +91,7 @@ not1mm/data/phonetics/yourcall.wav,sha256=4kheHJmCiRDL2kjhlgXQ8_u_eEMgKxiNGu5UBk
 not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,51768
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
-not1mm/lib/cat_interface.py,sha256=E0e1WRhXTbmXO21touJLFs9lCYSwaxSEu5mfNpB_sZg,16892
+not1mm/lib/cat_interface.py,sha256=NDlS4vdlH18oCgvXNjqFVymCAKJKyUNh6g1hmKwoV7k,16964
 not1mm/lib/cwinterface.py,sha256=Q8p3pScOHczZ8ptICfH1Yu6rCEwQJLgrNwYMN76B2i8,3389
 not1mm/lib/database.py,sha256=RQoj3JsTejMiiFIN42lY3N4jrj80htftdoFeRqVKnKs,42480
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -109,7 +109,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=fcosrUBBIZb-_oOavjoYpxsk9G56vUMzt8LVSpPq16U,48
+not1mm/lib/version.py,sha256=X7UsWTkmHNoMFl40ndtGBSQuMBMqWBxeRhSrC6sjElw,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -145,9 +145,9 @@ not1mm/plugins/naqp_ssb.py,sha256=VLWVrSzI0UP1AhSXYn61eZ7or1rz6a_pS_xCKfgS4Jw,11
 not1mm/plugins/phone_weekly_test.py,sha256=fLpMe03WB9_KgRl6vMgQQt_aktFdqfNt2Sw81CTRAUs,12325
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.7.13.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.7.13.dist-info/METADATA,sha256=8SqV2K1n5M8QA0zqtj0JSRXzPuajYxGQ-RUG1qL_0u0,29115
-not1mm-24.7.13.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-not1mm-24.7.13.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.7.13.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.7.13.dist-info/RECORD,,
+not1mm-24.7.19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.7.19.dist-info/METADATA,sha256=EdsnUz2o1LrulLIrNHTDLohqKB56-4s8S5VNWk5bWDw,29186
+not1mm-24.7.19.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
+not1mm-24.7.19.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.7.19.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.7.19.dist-info/RECORD,,

{not1mm-24.7.13.dist-info → not1mm-24.7.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (71.0.4)
 Root-Is-Purelib: true
 Tag: py3-none-any