From 0ecbbd0da117f102febd0e1f24dd2eeb6b2958d7 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Tue, 28 Aug 2018 16:04:49 -0400
Subject: [PATCH] Added reply button back into the main window

---
 mainwindow.cpp | 22 ++++++++++++----------
 mainwindow.h   |  2 +-
 mainwindow.ui  |  9 +++------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 96d2004..311015d 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -7181,12 +7181,12 @@ void MainWindow::on_cqMacroButton_clicked(){
     addMessageText(text);
 }
 
-void MainWindow::on_qtcMacroButton_clicked(){
-    QString qtc = m_config.my_station();
-    if(qtc.isEmpty()){
+void MainWindow::on_replyMacroButton_clicked(){
+    QString call = callsignSelected();
+    if(call.isEmpty()){
         return;
     }
-    addMessageText(QString("QTC %1").arg(qtc));
+    addMessageText(QString("%1 ").arg(call));
 }
 
 void MainWindow::on_qthMacroButton_clicked(){
@@ -7439,7 +7439,11 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
 
     menu->addSeparator();
 
+    bool emptyQTC = m_config.my_station().isEmpty();
+    bool emptyQTH = m_config.my_qth().isEmpty() && m_config.my_grid().isEmpty();
+
     auto qtcAction = menu->addAction(QString("%1 QTC message - Send my station message").arg(call).trimmed());
+    qtcAction->setDisabled(emptyQTC);
     connect(qtcAction, &QAction::triggered, this, [this](){
 
         QString selectedCall = callsignSelected();
@@ -7453,6 +7457,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
     });
 
     auto qthAction = menu->addAction(QString("%1 QTH message - Send my station location message").arg(call).trimmed());
+    qthAction->setDisabled(emptyQTH);
     connect(qthAction, &QAction::triggered, this, [this](){
 
         QString selectedCall = callsignSelected();
@@ -7466,7 +7471,7 @@ void MainWindow::buildQueryMenu(QMenu * menu, QString call){
     });
 
     auto grid = m_config.my_grid();
-    auto gridAction = menu->addAction(QString("%1 GRID %2 - Send my current station grid location").arg(call).arg(grid).trimmed());
+    auto gridAction = menu->addAction(QString("%1 GRID %2 - Send my current station Maidenhead grid locator").arg(call).arg(grid).trimmed());
     connect(gridAction, &QAction::triggered, this, [this](){
 
         QString selectedCall = callsignSelected();
@@ -8633,12 +8638,9 @@ void MainWindow::updateButtonDisplay(){
 
     bool isTransmitting = m_transmitting || m_txFrameCount > 0;
     bool emptyCallsign = callsignSelected().isEmpty();
-    bool emptyQTC = m_config.my_station().isEmpty();
-    bool emptyQTH = m_config.my_qth().isEmpty() && m_config.my_grid().isEmpty();
 
     ui->cqMacroButton->setDisabled(isTransmitting);
-    ui->qtcMacroButton->setDisabled(isTransmitting || emptyQTC);
-    ui->qthMacroButton->setDisabled(isTransmitting || emptyQTH);
+    ui->replyMacroButton->setDisabled(isTransmitting || emptyCallsign);
     ui->macrosMacroButton->setDisabled(isTransmitting);
     ui->queryButton->setDisabled(isTransmitting || emptyCallsign);
 }
@@ -9463,7 +9465,7 @@ void MainWindow::displayBandActivity() {
                     age = since(item.utcTimestamp);
                 }
 
-                auto joined = text.join("     ");
+                auto joined = text.join("");
                 if (joined.isEmpty()) {
                     continue;
                 }
diff --git a/mainwindow.h b/mainwindow.h
index 594a415..4d21c19 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -258,7 +258,7 @@ private slots:
   void on_rbFreeText_clicked(bool checked);
   void on_clearAction_triggered(QObject * sender);
   void on_cqMacroButton_clicked();
-  void on_qtcMacroButton_clicked();
+  void on_replyMacroButton_clicked();
   void on_qthMacroButton_clicked();
   void setSortBy(QString key, QString value);
   QString getSortBy(QString key, QString defaultValue);
diff --git a/mainwindow.ui b/mainwindow.ui
index 765dc3f..c1769fd 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1303,10 +1303,7 @@ QTextEdit[transmitting=&quot;true&quot;] {
          </widget>
         </item>
         <item row="1" column="2">
-         <widget class="QPushButton" name="qtcMacroButton">
-          <property name="visible">
-            <bool>false</bool>
-          </property>
+         <widget class="QPushButton" name="replyMacroButton">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -1314,10 +1311,10 @@ QTextEdit[transmitting=&quot;true&quot;] {
            </size>
           </property>
           <property name="toolTip">
-           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Send your station message&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reply to a CQ&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
           <property name="text">
-           <string>QTC</string>
+           <string>Reply</string>
           </property>
          </widget>
         </item>