From 8c81b3b83a9a2ea685519dd4d860c3fc4beafaa0 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Mon, 10 Dec 2018 09:44:03 -0500
Subject: [PATCH] Fixed #38: Moved Show Heartbeats menu item to the View menu

---
 mainwindow.cpp | 18 ++++++++----------
 mainwindow.h   |  1 +
 mainwindow.ui  |  9 +++++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 233c6ef..94ecfba 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2453,6 +2453,9 @@ void MainWindow::on_menuWindow_aboutToShow(){
 #if __APPLE__
     rebuildMacQAction(ui->menuWindow, ui->actionShow_Call_Activity_Columns);
 #endif
+
+    ui->actionShow_Band_Heartbeats_and_ACKs->setChecked(!m_hbHidden);
+    ui->actionShow_Band_Heartbeats_and_ACKs->setEnabled(ui->actionShow_Band_Activity->isChecked());
 }
 
 void MainWindow::on_actionShow_Fullscreen_triggered(bool checked){
@@ -2480,6 +2483,11 @@ void MainWindow::on_actionShow_Band_Activity_triggered(bool checked){
     m_bandActivityWasVisible = checked;
 }
 
+void MainWindow::on_actionShow_Band_Heartbeats_and_ACKs_triggered(bool checked){
+    m_hbHidden = !checked;
+    displayBandActivity();
+}
+
 void MainWindow::on_actionShow_Call_Activity_triggered(bool checked){
     auto hsizes = ui->textHorizontalSplitter->sizes();
     hsizes[2] = checked ? ui->textHorizontalSplitter->width()/4 : 0;
@@ -6609,16 +6617,6 @@ void MainWindow::on_clearAction_triggered(QObject * sender){
 }
 
 void MainWindow::buildHeartbeatMenu(QMenu *menu){
-    auto hide = menu->addAction("Show Heartbeats and ACKs");
-    hide->setCheckable(true);
-    hide->setChecked(!m_hbHidden);
-    connect(hide, &QAction::triggered, this, [this](bool checked){
-      m_hbHidden = !checked;
-      displayBandActivity();
-    });
-
-    menu->addSeparator();
-
     buildRepeatMenu(menu, ui->hbMacroButton, &m_hbInterval);
 
     menu->addSeparator();
diff --git a/mainwindow.h b/mainwindow.h
index 6118090..701268b 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -180,6 +180,7 @@ private slots:
   void on_actionShow_Fullscreen_triggered(bool checked);
   void on_actionShow_Frequency_Clock_triggered(bool checked);
   void on_actionShow_Band_Activity_triggered(bool checked);
+  void on_actionShow_Band_Heartbeats_and_ACKs_triggered(bool checked);
   void on_actionShow_Call_Activity_triggered(bool checked);
   void on_actionShow_Waterfall_triggered(bool checked);
   void on_actionShow_Waterfall_Controls_triggered(bool checked);
diff --git a/mainwindow.ui b/mainwindow.ui
index 117ba4f..9fe4e68 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -4700,6 +4700,7 @@ list. The list can be maintained in Settings (F2).</string>
     <addaction name="actionShow_Frequency_Clock"/>
     <addaction name="separator"/>
     <addaction name="actionShow_Band_Activity"/>
+    <addaction name="actionShow_Band_Heartbeats_and_ACKs"/>
     <addaction name="actionShow_Band_Activity_Columns"/>
     <addaction name="actionSort_Band_Activity"/>
     <addaction name="separator"/>
@@ -5600,6 +5601,14 @@ list. The list can be maintained in Settings (F2).</string>
     <string>CQ...</string>
    </property>
   </action>
+  <action name="actionShow_Band_Heartbeats_and_ACKs">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Band Heartbeats and ACKs</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>