From 8004c51ed2535cb3f336dbad561e2a76a494d622 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Tue, 27 Nov 2018 23:16:02 -0500
Subject: [PATCH] Hide configuration for heartbeat.

---
 Configuration.ui | 132 ++++++++++++++++++++++++++++++-----------------
 mainwindow.cpp   |  14 ++---
 2 files changed, 92 insertions(+), 54 deletions(-)

diff --git a/Configuration.ui b/Configuration.ui
index c68e5cc..703becf 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -278,9 +278,9 @@
               <property name="geometry">
                <rect>
                 <x>0</x>
-                <y>-26</y>
+                <y>0</y>
                 <width>724</width>
-                <height>479</height>
+                <height>410</height>
                </rect>
               </property>
               <layout class="QVBoxLayout" name="verticalLayout_26">
@@ -632,7 +632,61 @@ text message.</string>
                 </widget>
                </item>
                <item>
-                <widget class="QGroupBox" name="groupBox_12">
+                <widget class="QGroupBox" name="groupBox_8">
+                 <property name="title">
+                  <string>Idle Watchdog</string>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_32">
+                  <item>
+                   <layout class="QHBoxLayout" name="horizontalLayout_12">
+                    <item>
+                     <widget class="QLabel" name="label_10">
+                      <property name="text">
+                       <string>Disable automatic transmissions:</string>
+                      </property>
+                      <property name="buddy">
+                       <cstring>tx_watchdog_spin_box</cstring>
+                      </property>
+                     </widget>
+                    </item>
+                    <item>
+                     <widget class="QSpinBox" name="tx_watchdog_spin_box">
+                      <property name="toolTip">
+                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended heartbeat transmissions are aborted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                      </property>
+                      <property name="specialValueText">
+                       <string>Disabled</string>
+                      </property>
+                      <property name="suffix">
+                       <string> minutes of inactivity</string>
+                      </property>
+                      <property name="prefix">
+                       <string>after </string>
+                      </property>
+                      <property name="minimum">
+                       <number>0</number>
+                      </property>
+                      <property name="maximum">
+                       <number>1440</number>
+                      </property>
+                      <property name="singleStep">
+                       <number>1</number>
+                      </property>
+                      <property name="value">
+                       <number>60</number>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </item>
+                 </layout>
+                </widget>
+               </item>
+               <item>
+                <widget class="QGroupBox" name="heartbeatGroupBox">
+                 <property name="visible">
+                  <bool>false</bool>
+                 </property>
                  <property name="title">
                   <string>Heartbeat (HB)</string>
                  </property>
@@ -683,48 +737,6 @@ text message.</string>
                     </item>
                    </layout>
                   </item>
-                  <item>
-                   <layout class="QHBoxLayout" name="horizontalLayout_12">
-                    <item>
-                     <widget class="QLabel" name="label_10">
-                      <property name="text">
-                       <string>Heartbeat idle watchdog timer:</string>
-                      </property>
-                      <property name="buddy">
-                       <cstring>tx_watchdog_spin_box</cstring>
-                      </property>
-                     </widget>
-                    </item>
-                    <item>
-                     <widget class="QSpinBox" name="tx_watchdog_spin_box">
-                      <property name="toolTip">
-                       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Number of minutes before unattended heartbeat transmissions are aborted.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-                      </property>
-                      <property name="specialValueText">
-                       <string>Disabled</string>
-                      </property>
-                      <property name="suffix">
-                       <string> minutes</string>
-                      </property>
-                      <property name="prefix">
-                       <string>after </string>
-                      </property>
-                      <property name="minimum">
-                       <number>0</number>
-                      </property>
-                      <property name="maximum">
-                       <number>1440</number>
-                      </property>
-                      <property name="singleStep">
-                       <number>1</number>
-                      </property>
-                      <property name="value">
-                       <number>60</number>
-                      </property>
-                     </widget>
-                    </item>
-                   </layout>
-                  </item>
                   <item>
                    <spacer name="verticalSpacer_2">
                     <property name="orientation">
@@ -745,6 +757,19 @@ text message.</string>
              </widget>
             </widget>
            </item>
+           <item>
+            <spacer name="verticalSpacer_5">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
           </layout>
          </widget>
         </widget>
@@ -1986,9 +2011,9 @@ both here.</string>
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>0</y>
+            <y>-23</y>
             <width>746</width>
-            <height>548</height>
+            <height>525</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_30">
@@ -2385,6 +2410,19 @@ for assessing propagation and system performance.</string>
              </layout>
             </widget>
            </item>
+           <item>
+            <spacer name="verticalSpacer_7">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
            <item>
             <spacer name="verticalSpacer_4">
              <property name="orientation">
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 87cc08a..9b97089 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6534,13 +6534,13 @@ void MainWindow::on_clearAction_triggered(QObject * sender){
 
 void MainWindow::buildRepeatMenu(QMenu *menu, QPushButton * button, int * interval){
     QList<QPair<QString, int>> items = {
-        {"Do Not Repeat",     0},
-        {"Every 1 minute",    1},
-        {"Every 5 minutes",   5},
-        {"Every 10 minutes", 10},
-        {"Every 15 minutes", 15},
-        {"Every 30 minutes", 30},
-        {"Every 60 minutes", 60}
+        {"Do not repeat",     0},
+        {"Repeat every 1 minute",    1},
+        {"Repeat every 5 minutes",   5},
+        {"Repeat every 10 minutes", 10},
+        {"Repeat every 15 minutes", 15},
+        {"Repeat every 30 minutes", 30},
+        {"Repeat every 60 minutes", 60},
     };
 
     QActionGroup * group = new QActionGroup(menu);