Merge pull request #241 from awandahl/no_name-general-logging

Update general_logging.py
mbridak · Dec 16, 2024 · 4bb310d · 4bb310d
2 parents bd83080 + 43ee693
commit 4bb310d
Showing 1 changed file with 23 additions and 14 deletions.
diff --git a/not1mm/plugins/general_logging.py b/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: