From 83c742f7ecf42ea1001fba976fd5008070a0d06c Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Fri, 20 Jul 2018 10:54:00 -0400
Subject: [PATCH] Double click band activity now transfers the received message
 into the directed activity window and further transmissions on the offset
 will be added to the window automatically

---
 mainwindow.cpp | 31 ++++++++++++++++++++++++++++---
 mainwindow.h   |  2 +-
 mainwindow.ui  |  6 +++---
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4551407..f9bfa79 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3308,6 +3308,7 @@ void MainWindow::readFromStdout()                             //readFromStdout
       }
 
       if(isRecentOffset(audioFreq) || isAllCallIncluded(decodedtext.message())){
+         // TODO: jsherer - create a method for bumping this...
          m_rxRecentCache.insert(audioFreq/10*10, new QDateTime(QDateTime::currentDateTimeUtc()), 25);
          bDisplayRight = true;
       }
@@ -6825,8 +6826,8 @@ void MainWindow::on_cqMacroButton_clicked(){
     addMessageText(text);
 }
 
-void MainWindow::on_deMacroButton_clicked(){
-    addMessageText(m_config.my_callsign());
+void MainWindow::on_qtcMacroButton_clicked(){
+    addMessageText(m_config.my_station());
 }
 
 void MainWindow::on_replyMacroButton_clicked(){
@@ -7032,12 +7033,36 @@ void MainWindow::on_tableWidgetRXAll_cellDoubleClicked(int row, int col){
     // TODO: jsherer - could also parse the messages for the last callsign?
     auto item = ui->tableWidgetRXAll->item(row, 0);
     int offset = item->text().toInt();
+
+    // print the history in the main window...
+    int activityAging = m_config.activity_aging();
+    QDateTime now = QDateTime::currentDateTimeUtc();
+    QDateTime firstActivity = now;
+    QString activityText;
+    foreach(auto d, m_bandActivity[offset]){
+        if(activityAging && d.utcTimestamp.secsTo(now)/60 >= activityAging){
+            continue;
+        }
+        if(activityText.isEmpty()){
+            firstActivity = d.utcTimestamp;
+        }
+        activityText.append(d.text);
+    }
+    if(!activityText.isEmpty()){
+        int block = logRxTxMessageText(firstActivity, true, activityText, offset, false);
+        m_rxFrameBlockNumbers[offset] = block;
+        m_rxRecentCache.insert(offset/10*10, new QDateTime(QDateTime::currentDateTimeUtc()), 25);
+    }
+
+#if 0
+    // drop the callsign (if one) in the edit window
     foreach(auto d, m_callActivity.values()){
         if(d.freq == offset){
             addMessageText(d.call);
             break;
         }
     }
+#endif
 }
 
 void MainWindow::on_tableWidgetRXAll_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected){
@@ -7981,7 +8006,7 @@ void MainWindow::updateButtonDisplay(){
 
     ui->cqMacroButton->setDisabled(isTransmitting);
     ui->replyMacroButton->setDisabled(isTransmitting || emptyCallsign);
-    ui->deMacroButton->setDisabled(isTransmitting);
+    ui->qtcMacroButton->setDisabled(isTransmitting);
     ui->qthMacroButton->setDisabled(isTransmitting);
     ui->snrMacroButton->setDisabled(isTransmitting || emptyCallsign);
     ui->queryButton->setDisabled(isTransmitting || emptyCallsign);
diff --git a/mainwindow.h b/mainwindow.h
index b373776..aee3425 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -236,7 +236,7 @@ private slots:
   void on_rbFreeText_clicked(bool checked);
   void on_clearAction_triggered(QObject * sender);
   void on_cqMacroButton_clicked();
-  void on_deMacroButton_clicked();
+  void on_qtcMacroButton_clicked();
   void on_replyMacroButton_clicked();
   void on_qthMacroButton_clicked();
   void on_snrMacroButton_clicked();
diff --git a/mainwindow.ui b/mainwindow.ui
index 8be812a..f3e3017 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -1148,7 +1148,7 @@ background:yellow;
          </widget>
         </item>
         <item row="1" column="3">
-         <widget class="QPushButton" name="deMacroButton">
+         <widget class="QPushButton" name="qtcMacroButton">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -1156,10 +1156,10 @@ background:yellow;
            </size>
           </property>
           <property name="visible">
-           <bool>false</bool>
+           <bool>true</bool>
           </property>
           <property name="text">
-           <string>DE</string>
+           <string>QTC</string>
           </property>
          </widget>
         </item>