not1mm 24.12.15__tar.gz → 24.12.29__tar.gz

{not1mm-24.12.15 → not1mm-24.12.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.12.15
+Version: 24.12.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -239,6 +239,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-29] Add {LOGIT} macro.
 - [24-12-15] Fixed Button focus policy in the bandmap window.
 - [24-12-14] Changed method of detecting fldigi QSOs. See docs.
 - [24-12-12] Add a try exception for a unicode decode error.
@@ -688,6 +689,7 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {LOGIT} | Log the contact after macro pressed. |
 | '#' | Sends serial number. |
 
 ### Macro use with voice

{not1mm-24.12.15 → not1mm-24.12.29}/README.md

@@ -208,6 +208,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-29] Add {LOGIT} macro.
 - [24-12-15] Fixed Button focus policy in the bandmap window.
 - [24-12-14] Changed method of detecting fldigi QSOs. See docs.
 - [24-12-12] Add a try exception for a unicode decode error.
@@ -657,6 +658,7 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {LOGIT} | Log the contact after macro pressed. |
 | '#' | Sends serial number. |
 
 ### Macro use with voice

{not1mm-24.12.15 → not1mm-24.12.29}/not1mm/__main__.py

@@ -1742,7 +1742,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         self.show_message_box(
-            "[CTRL-Esc]\tStops cwdaemon from sending Morse.\n"
+            "[ESC]\tStops cwdaemon from sending Morse.\n"
             "[PgUp]\tIncreases the cw sending speed.\n"
             "[PgDown]\tDecreases the cw sending speed.\n"
             "[Arrow-Up] Jump to the next spot above the current VFO cursor\n"
@@ -2731,6 +2731,9 @@ class MainWindow(QtWidgets.QMainWindow):
         macro = macro.replace(
             "{EXCH}", self.contest_settings.get("SentExchange", "xxx")
         )
+        if "{LOGIT}" in macro:
+            macro = macro.replace("{LOGIT}", "")
+            self.save_contact()
         return macro
 
     def ptt_on(self) -> None:

not1mm-24.12.29/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "24.12.29"

{not1mm-24.12.15 → not1mm-24.12.29}/not1mm/plugins/general_logging.py

@@ -183,14 +183,18 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 buttons_to_send.append(self.esm_dict["HISCALL"])
                 buttons_to_send.append(self.esm_dict["EXCH"])
 
+#        elif self.current_widget in ["other_1", "other_2"]:
+#            if self.other_2.text() == "" and self.other_1.text() == "":
+#                self.make_button_green(self.esm_dict["AGN"])
+#                buttons_to_send.append(self.esm_dict["AGN"])
+#            else:
+#                self.make_button_green(self.esm_dict["QRZ"])
+#                buttons_to_send.append(self.esm_dict["QRZ"])
+#                buttons_to_send.append("LOGIT")
+
         elif self.current_widget in ["other_1", "other_2"]:
-            if self.other_2.text() == "" and self.other_1.text() == "":
-                self.make_button_green(self.esm_dict["AGN"])
-                buttons_to_send.append(self.esm_dict["AGN"])
-            else:
-                self.make_button_green(self.esm_dict["QRZ"])
-                buttons_to_send.append(self.esm_dict["QRZ"])
-                buttons_to_send.append("LOGIT")
+            buttons_to_send.append("LOGIT")
+
 
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
@@ -205,14 +209,19 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 
+#        elif self.current_widget in ["other_1", "other_2"]:
+#            if self.other_2.text() == "" and self.other_1.text() == "":
+#                self.make_button_green(self.esm_dict["AGN"])
+#                buttons_to_send.append(self.esm_dict["AGN"])
+#            else:
+#                self.make_button_green(self.esm_dict["EXCH"])
+#                buttons_to_send.append(self.esm_dict["EXCH"])
+#                buttons_to_send.append("LOGIT")
+
         elif self.current_widget in ["other_1", "other_2"]:
-            if self.other_2.text() == "" and self.other_1.text() == "":
-                self.make_button_green(self.esm_dict["AGN"])
-                buttons_to_send.append(self.esm_dict["AGN"])
-            else:
-                self.make_button_green(self.esm_dict["EXCH"])
-                buttons_to_send.append(self.esm_dict["EXCH"])
-                buttons_to_send.append("LOGIT")
+            buttons_to_send.append("LOGIT")
+
+
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
                 if button:

{not1mm-24.12.15 → not1mm-24.12.29}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.12.15
+Version: 24.12.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -239,6 +239,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-29] Add {LOGIT} macro.
 - [24-12-15] Fixed Button focus policy in the bandmap window.
 - [24-12-14] Changed method of detecting fldigi QSOs. See docs.
 - [24-12-12] Add a try exception for a unicode decode error.
@@ -688,6 +689,7 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {LOGIT} | Log the contact after macro pressed. |
 | '#' | Sends serial number. |
 
 ### Macro use with voice

{not1mm-24.12.15 → not1mm-24.12.29}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.12.15"
+version = "24.12.29"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"

not1mm-24.12.15/not1mm/lib/version.py

@@ -1,3 +0,0 @@
-"""It's the version"""
-
-__version__ = "24.12.15"