From 3a5959925374521bc21b018de5f9b52ce23c88f1 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Fri, 16 Nov 2018 15:36:02 -0500
Subject: [PATCH] Fix SELCALL and HB menu items toggle vs click

---
 mainwindow.cpp | 58 +++++++++++++++++++++++---------------------------
 mainwindow.h   |  2 --
 2 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b0ea212..ac3d6cf 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2660,7 +2660,23 @@ void MainWindow::on_monitorTxButton_toggled(bool checked){
 }
 
 void MainWindow::on_selcalButton_toggled(bool checked){
+    if(checked){
+        if(callsignSelected() == "@ALLCALL"){
+            clearCallsignSelected();
+        }
+        if(ui->tableWidgetRXAll->isVisible()){
+            ui->tableWidgetRXAll->setVisible(false);
+            m_bandActivityWasVisible = true;
+        } else {
+            m_bandActivityWasVisible = false;
+        }
+    } else {
+        ui->tableWidgetRXAll->setVisible(m_bandActivityWasVisible);
+    }
+
     resetPushButtonToggleText(ui->selcalButton);
+
+    displayCallActivity();
 }
 
 void MainWindow::on_tuneButton_toggled(bool checked){
@@ -2672,6 +2688,17 @@ void MainWindow::on_spotButton_toggled(bool checked){
 }
 
 void MainWindow::on_heartbeatButton_toggled(bool checked){
+    // clear the ping queue when you toggle the button
+    m_txHeartbeatQueue.clear();
+    displayBandActivity();
+
+    // then process the action
+    if(checked){
+        scheduleHeartbeat(false);
+    } else {
+        pauseHeartbeat();
+    }
+
     resetPushButtonToggleText(ui->heartbeatButton);
 }
 
@@ -7458,37 +7485,6 @@ void MainWindow::on_pbT2R_clicked()
     }
 }
 
-void MainWindow::on_heartbeatButton_clicked()
-{
-    // clear the ping queue when you toggle the button
-    m_txHeartbeatQueue.clear();
-    displayBandActivity();
-
-    // then process the action
-    if(ui->heartbeatButton->isChecked()){
-        scheduleHeartbeat(false);
-    } else {
-        pauseHeartbeat();
-    }
-}
-
-void MainWindow::on_selcalButton_clicked(){
-    if(ui->selcalButton->isChecked()){
-        if(callsignSelected() == "@ALLCALL"){
-            clearCallsignSelected();
-        }
-        if(ui->tableWidgetRXAll->isVisible()){
-            ui->tableWidgetRXAll->setVisible(false);
-            m_bandActivityWasVisible = true;
-        } else {
-            m_bandActivityWasVisible = false;
-        }
-    } else {
-        ui->tableWidgetRXAll->setVisible(m_bandActivityWasVisible);
-    }
-    displayCallActivity();
-}
-
 void MainWindow::on_readFreq_clicked()
 {
   if (m_transmitting) return;
diff --git a/mainwindow.h b/mainwindow.h
index 49039e0..488973e 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -326,8 +326,6 @@ private slots:
   void on_tuneButton_clicked (bool);
   void on_pbR2T_clicked();
   void on_pbT2R_clicked();
-  void on_heartbeatButton_clicked();
-  void on_selcalButton_clicked();
   void acceptQSO (QDateTime const&, QString const& call, QString const& grid
                   , Frequency dial_freq, QString const& mode
                   , QString const& rpt_sent, QString const& rpt_received