not1mm 24.5.25__py3-none-any.whl → 24.6.1__py3-none-any.whl

not1mm/__main__.py

@@ -510,12 +510,12 @@ class MainWindow(QtWidgets.QMainWindow):
         self.current_op = self.station.get("Call", "")
         self.voice_process.current_op = self.current_op
         self.make_op_dir()
-        self.read_cw_macros()
+
         self.clearinputs()
 
         if self.pref.get("contest"):
             self.load_contest()
-
+        self.read_cw_macros()
         self.actionLog_Window.setChecked(self.pref.get("logwindow", False))
         if self.log_window:
             self.log_window.close()

not1mm/data/main.ui

@@ -1741,6 +1741,11 @@
    <property name="text">
     <string>HotKeys</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionUpdate_MASTER_SCP">
    <property name="text">
@@ -1751,6 +1756,11 @@
    <property name="text">
     <string>Help</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionUpdate_CTY">
    <property name="text">
@@ -1764,6 +1774,11 @@
    <property name="text">
     <string>Check Partial</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionVFO">
    <property name="checkable">
@@ -1772,6 +1787,11 @@
    <property name="text">
     <string>VFO</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
   <action name="actionDark_Mode_2">
    <property name="checkable">
@@ -1780,6 +1800,11 @@
    <property name="text">
     <string>Dark Mode</string>
    </property>
+   <property name="font">
+    <font>
+     <family>JetBrains Mono</family>
+    </font>
+   </property>
   </action>
  </widget>
  <resources/>

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.5.25"
+__version__ = "24.6.1"

not1mm/plugins/arrl_10m.py

@@ -167,9 +167,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

not1mm/plugins/arrl_ss_cw.py

@@ -126,9 +126,9 @@ def predupe(self):
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)

not1mm/plugins/arrl_ss_phone.py

@@ -126,9 +126,9 @@ def predupe(self):
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)

not1mm/plugins/arrl_vhf_jan.py

@@ -156,9 +156,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

not1mm/plugins/arrl_vhf_jun.py

@@ -124,9 +124,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

not1mm/plugins/arrl_vhf_sep.py

@@ -124,9 +124,9 @@ def predupe(self):
 def prefill(self):
     """Fill sentnr"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

not1mm/plugins/canada_day.py

@@ -155,9 +155,9 @@ def prefill(self):
     #     self.other_2.setText(str(self.contact.get("ZN", "")))
 
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
 
     exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
     field = self.field3.findChild(QtWidgets.QLineEdit)

not1mm/plugins/cq_wpx_cw.py

@@ -157,9 +157,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)

not1mm/plugins/cq_wpx_ssb.py

@@ -122,9 +122,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.field3.findChild(QtWidgets.QLineEdit)
     if len(field.text()) == 0:
         field.setText(serial_nr)
@@ -135,35 +135,39 @@ def points(self):
     result = self.cty_lookup(self.station.get("Call", ""))
     if result:
         for item in result.items():
-            mycountry = item[1].get("entity", "")
-            mycontinent = item[1].get("continent", "")
+            my_country = item[1].get("entity", "")
+            my_continent = item[1].get("continent", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
     band = int(int(float(self.contact.get("Freq", 0))) / 1000)
     if result:
         for item in result.items():
-            entity = item[1].get("entity", "")
-            continent = item[1].get("continent", "")
+            their_country = item[1].get("entity", "")
+            their_continent = item[1].get("continent", "")
 
-            # If both are in North America
-            if mycontinent == "NA" and continent == "NA":
+            # Different Continent
+            if my_continent != their_continent:
                 if band in [28, 21, 14]:
-                    return 2
-                return 4
+                    return 3
+                return 6
 
-            # Not NA, Both in same country
-            if mycountry.upper() == entity.upper():
+            # Both in same country
+            if my_country.upper() == their_country.upper():
                 return 1
 
-            # Same Continent
-            if mycontinent == continent:
+            # Below Same Continent Different Country
+
+            # If in North America
+            if my_continent == "NA":
+                if band in [28, 21, 14]:
+                    return 2
+                return 4
+
+            # Non NA
+            if my_continent != "NA":
                 if band in [28, 21, 14]:
                     return 1
                 return 2
-
-            # Different Continent
-            if band in [28, 21, 14]:
-                return 3
-            return 6
+    # Something wrong
     return 0
 
 

not1mm/plugins/icwc_mst.py

@@ -138,9 +138,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1"))
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
     if serial_nr == "None":
-        serial_nr = "1"
+        serial_nr = "001"
     field = self.sent
     if len(field.text()) == 0:
         field.setText(serial_nr)

not1mm/plugins/jidx_cw.py

@@ -152,9 +152,9 @@ def prefill(self):
     SentExchange = self.contest_settings.get("SentExchange", "")
     if "#" in SentExchange:
         result = self.database.get_serial()
-        serial_nr = str(result.get("serial_nr", "1"))
+        serial_nr = str(result.get("serial_nr", "1")).zfill(3)
         if serial_nr == "None":
-            serial_nr = "1"
+            serial_nr = "001"
         SentExchange.replace("#", str(serial_nr))
 
     field = self.field3.findChild(QtWidgets.QLineEdit)

not1mm/plugins/jidx_ph.py

@@ -123,9 +123,9 @@ def prefill(self):
     SentExchange = self.contest_settings.get("SentExchange", "")
     if "#" in SentExchange:
         result = self.database.get_serial()
-        serial_nr = str(result.get("serial_nr", "1"))
+        serial_nr = str(result.get("serial_nr", "1")).zfill(3)
         if serial_nr == "None":
-            serial_nr = "1"
+            serial_nr = "001"
         SentExchange.replace("#", str(serial_nr))
 
     field = self.field3.findChild(QtWidgets.QLineEdit)

{not1mm-24.5.25.dist-info → not1mm-24.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.5.25
+Version: 24.6.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -182,10 +182,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-5-25] Fixed points calculation for CQ WW WPX.
-- [24-5-10] Add sanity check for VFO freq.
-- [24-5-9] Add ICWC MST.
-- [24-5-1] Moved the voice keying into it's own thread.
+- [24-6-1] Added leading zeros to S/N's less than 100.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.5.25.dist-info → not1mm-24.6.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=CtRVGZkQAZfIPsm73V3qrE7Ms42GugEJU4h_trp42XQ,120468
+not1mm/__main__.py,sha256=_TKcKM99SBbp_ut6Q8gjMHaDMOmHbN7i7fxFkTxQ4WE,120468
 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=wtfBeYdgv0VYuwlXx6WlKbKkrML_zeiSx79866Wi6cM,54585
+not1mm/data/main.ui,sha256=bA4vHNtjus1k9c7wBkivevEUAoI7KMhlJuXvew73PWc,55090
 not1mm/data/new_contest.ui,sha256=qP4v6el5mZrIuHUcIZXDkNviuGJk09ZtnpwpgxzQ6TY,21928
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=mC4OhoVIfR1H9IqHAKXliPMm8VOVmxSEadpsFQ7XnS4,2247
@@ -109,45 +109,45 @@ 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=VHeig4z_uQcaI8HKSMmgrSC9_guOzXa1U4cBNlqn1MU,48
+not1mm/lib/version.py,sha256=xUaNiiiMWmHQIv0eFOoUZ3KpJTW_GxDDro26y3eIaAQ,47
 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
 not1mm/plugins/10_10_summer_phone.py,sha256=VJTCD2JikpzVTEYG6naK_n6cGQXgxVHvLV7pmYt1hq0,10967
 not1mm/plugins/10_10_winter_phone.py,sha256=kFz4DRU850_dhHIQAhrVfGfQ8c59Rkcdurq4mk3XBQY,10970
 not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/plugins/arrl_10m.py,sha256=IGJyRQgDXsXuxBzJJpiWsKYFBdwyV1pAy9R8c6S8lDY,13757
+not1mm/plugins/arrl_10m.py,sha256=EyNRb3Sm0Qb-GVm0p05EnadlHisVh7y-sKTBP2ddMLo,13768
 not1mm/plugins/arrl_dx_cw.py,sha256=LVnYDNFEUiIpQ1TlhOCcRK7JNwH5XPO5WzUoApSUMTY,13802
 not1mm/plugins/arrl_dx_ssb.py,sha256=fUFzuNbCAfA5sQSYm8ISV3P9Z_2xnuKeOdO6E66zn1k,13805
 not1mm/plugins/arrl_field_day.py,sha256=OSro24LsSVW41yecKziWQMjflJbo62P8C53Q3M3-Lb0,10052
 not1mm/plugins/arrl_rtty_ru.py,sha256=hKUS4isjdXo3EYxQrsqsDupPp2chW8fpoWj0T1pTgJ4,7994
-not1mm/plugins/arrl_ss_cw.py,sha256=pBBoUozHfgcAR6Xy-FBYYZrDSSdK8YVclNZIiCn23ho,13069
-not1mm/plugins/arrl_ss_phone.py,sha256=BNcE4zfhK1LphKbI2tT_NJye8tIA_rb3QtxINERSIpE,13057
-not1mm/plugins/arrl_vhf_jan.py,sha256=tC5FyMQNqKNVI8V3r1p71wJvvUNQ0XPXVvxEj4cMyio,12561
-not1mm/plugins/arrl_vhf_jun.py,sha256=F4eHxuxH-8GM7kuTWvYXeKtx-M0KC_U3T_4Fm3u4h5s,11580
-not1mm/plugins/arrl_vhf_sep.py,sha256=AEKCxDk3UhUWDGT1rNmJ2dk94ihXQ8jexkemkx9N-xQ,11580
-not1mm/plugins/canada_day.py,sha256=dZWmwbdjO4CUSu_cK6FAZxII0DhaEMji_mmrpMO5wjo,11987
+not1mm/plugins/arrl_ss_cw.py,sha256=4yN68xZMuJRaSUfdiY4hafC07A3lifl5q6DEUZ-oYPQ,13080
+not1mm/plugins/arrl_ss_phone.py,sha256=Yzc5sNjrY8TlnozbYF6k8hbEamyDuUAD_3-BNqHgXqY,13068
+not1mm/plugins/arrl_vhf_jan.py,sha256=jkX9v2HHsjoawtTKiy8X0Td_HtfGQVT3MapJwpmM1qA,12572
+not1mm/plugins/arrl_vhf_jun.py,sha256=_9h6joxVCRCoFuNnyTOlnonafvrMv7H0eBERhYCoGug,11591
+not1mm/plugins/arrl_vhf_sep.py,sha256=XbS1OSAfGaYXFaTAP2HRyVvVeRD_Z6cefPc1_mOLJKw,11591
+not1mm/plugins/canada_day.py,sha256=OVpcCl1Chse_zLHf6PayTrgawWM4W-pmrTw40Al-o9s,11998
 not1mm/plugins/cq_160_cw.py,sha256=e9ajqIzDRteSI7zQaFpXUJ_6SNvBlIuNq213wadReUs,14139
 not1mm/plugins/cq_160_ssb.py,sha256=7MuMC_AVlj9ds_ohvEU4Tts-z9eTvnsSIENSMFKQCBc,14182
-not1mm/plugins/cq_wpx_cw.py,sha256=2vERpr5rajPQqKX9ME10hxhQX78inmDDQInYt21tg8Q,14026
-not1mm/plugins/cq_wpx_ssb.py,sha256=Ptx4GDXgnM9c38fB9LN2KSPVfnSVB2-OFySsHqxHHyw,12567
+not1mm/plugins/cq_wpx_cw.py,sha256=9aNzAR-KhznIwUlxUFjAi_hbiw_6RrCMwUBk9I2f6Hs,14037
+not1mm/plugins/cq_wpx_ssb.py,sha256=-hGRovqHR9rfOUnG4LPOoABTb4heH8VAX6rYdJbCqsw,12687
 not1mm/plugins/cq_ww_cw.py,sha256=ltXFnSXabCOuW70s-WOydgghZTNpztX8TKLpVIV50B4,11194
 not1mm/plugins/cq_ww_ssb.py,sha256=kt-EQofmCbynX1iXFm9ehffi_TMW25ke8Qi9MiR69ZQ,11199
 not1mm/plugins/cwt.py,sha256=4xdXN6ZJM5k-6gn0hJzNheWfFlGiqquC2p0ZMEe516M,12818
 not1mm/plugins/general_logging.py,sha256=t02xtJs601qRICGdrvLs3G9y4GCG9H4AgQNkgA18CYs,3467
 not1mm/plugins/iaru_hf.py,sha256=-ROUo2gBkw3xB89t8bd-4f7_1hROw2VXZXVHLFdB62s,11541
-not1mm/plugins/icwc_mst.py,sha256=v8L5NX2QmTM7x8Po1mb4yfN-dGVIuqky5MIT-OjfaVY,11831
-not1mm/plugins/jidx_cw.py,sha256=-cHhOFDy6lojD8cPaE6bYxrHmQ-x27QL3rh91YGZfbU,12142
-not1mm/plugins/jidx_ph.py,sha256=xKIYbs27uploZ5srUvsVHHskcV6-fLkGEsSJ0i-rky4,11172
+not1mm/plugins/icwc_mst.py,sha256=BaUP2kzrT2D27un_WLGT4HCTTi1e7CNYC4NHcC_9r74,11842
+not1mm/plugins/jidx_cw.py,sha256=9oV4hDxMiGXa9wuYUNYOCsr-mz8LYB-4WMHBN8u2dFk,12153
+not1mm/plugins/jidx_ph.py,sha256=T-V7-77SIwu-Jl55VIrbVFZlsBoc97mXtgbdde0GaiQ,11183
 not1mm/plugins/k1usn_sst.py,sha256=odFgK1cwT2CKC1w64LKrBDSAflb-Ak2-MTL9LzmHHIM,742
 not1mm/plugins/naqp_cw.py,sha256=c0MuKqfkIxiYFvv2z7vqrBz3m9FSnSYkPK3f-DdkTIA,12632
 not1mm/plugins/naqp_ssb.py,sha256=VLWVrSzI0UP1AhSXYn61eZ7or1rz6a_pS_xCKfgS4Jw,11595
 not1mm/plugins/phone_weekly_test.py,sha256=gCX0ESUoiQzDp9puwibt9-dRembNsiuEeBdawCVvjHA,12316
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.5.25.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.5.25.dist-info/METADATA,sha256=fKBQyj2_AD0RdQcJvWEhoq-BYGD1sh4quPYwYiFLOqY,27441
-not1mm-24.5.25.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.5.25.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.5.25.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.5.25.dist-info/RECORD,,
+not1mm-24.6.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.6.1.dist-info/METADATA,sha256=QeRmlzKcGeu8XQRocz8TD0HN5TZAXHjdYePXEt7Oqr4,27319
+not1mm-24.6.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.6.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.6.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.6.1.dist-info/RECORD,,