From 52bb594ff823c09b7b31e3ff2159880f89cab261 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 18 Oct 2018 15:23:30 -0400
Subject: [PATCH 1/2] Make sure that fox-and-contest log is displayed when
 using contest messages.

---
 mainwindow.cpp | 5 +++--
 wsjtx.pro      | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 20278da01..9643cd8af 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3752,8 +3752,9 @@ void MainWindow::guiUpdate()
 
 //Once per second:
   if(nsec != m_sec0) {
-//    qDebug() << "OneSec:" << m_nContest << m_Nslots;
-    if(!m_msgAvgWidget and m_nContest>0 and m_nContest<6) on_actionFox_Log_triggered();
+//    qDebug() << "OneSec:" << m_nContest << m_msgAvgWidget;
+    if((!m_msgAvgWidget or (m_msgAvgWidget and !m_msgAvgWidget->isVisible()))
+       and (m_nContest>0) and (m_nContest<6)) on_actionFox_Log_triggered();
     if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
       if(!m_bVHFwarned) vhfWarning();
     } else {
diff --git a/wsjtx.pro b/wsjtx.pro
index 965d76147..aca60e78c 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -68,8 +68,7 @@ SOURCES += \
   WSPRBandHopping.cpp MessageAggregator.cpp SampleDownloader.cpp qt_helpers.cpp\
   MultiSettings.cpp PhaseEqualizationDialog.cpp IARURegions.cpp MessageBox.cpp \
   EqualizationToolsDialog.cpp CallsignValidator.cpp ExchangeValidator.cpp \
-  colorhighlighting.cpp ExportCabrillo.cpp LotWUsers.cpp
-
+  colorhighlighting.cpp ExportCabrillo.cpp LotWUsers.cpp TraceFile.cpp
 HEADERS  += qt_helpers.hpp \
   pimpl_h.hpp pimpl_impl.hpp \
   Radio.hpp NetworkServerLookup.hpp revision_utils.hpp \
@@ -85,7 +84,7 @@ HEADERS  += qt_helpers.hpp \
   messageaveraging.h echoplot.h echograph.h fastgraph.h fastplot.h Modes.hpp WSPRBandHopping.hpp \
   WsprTxScheduler.h SampleDownloader.hpp MultiSettings.hpp PhaseEqualizationDialog.hpp \
   IARURegions.hpp MessageBox.hpp EqualizationToolsDialog.hpp CallsignValidator.hpp \
-  ExchangeValidator.hpp colorhighlighting.h ExportCabrillo.h LotWUsers.h
+  ExchangeValidator.hpp colorhighlighting.h ExportCabrillo.h LotWUsers.h TraceFile.hpp
 
 
 INCLUDEPATH += qmake_only

From a65930ea935fc412b0e66b3079382cfda011bdc0 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 18 Oct 2018 15:45:16 -0400
Subject: [PATCH 2/2] Ctrl+A now aborts a QSO and selects Tx6. Should more be
 done?

---
 mainwindow.cpp | 14 +++++++++++++-
 mainwindow.h   |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9643cd8af..23c7c8e80 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1867,6 +1867,11 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
         }
       }
       return;
+    case Qt::Key_A:
+      if(e->modifiers() & Qt::ControlModifier) {
+        abortQSO();
+        return;
+      }
     case Qt::Key_X:
       if(e->modifiers() & Qt::AltModifier) {
         foxTest();
@@ -1931,7 +1936,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
       break;
     case Qt::Key_PageDown:
       band_changed(m_freqNominal-2000);
-      qDebug() << "Down" << m_freqNominal;
       break;  }
 
   QMainWindow::keyPressEvent (e);
@@ -4676,6 +4680,14 @@ void MainWindow::genCQMsg ()
   }
 }
 
+void MainWindow::abortQSO()
+{
+  bool b=m_auto;
+  clearDX();
+  if(b and !m_auto) auto_tx_mode(true);
+  ui->txrb6->setChecked(true);
+}
+
 bool MainWindow::stdCall(QString w)
 {
   int n=w.trimmed().length();
diff --git a/mainwindow.h b/mainwindow.h
index 03bdf96e2..63d08a424 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -704,6 +704,7 @@ private:
   void CQTxFreq();
   void cabLog();
   void useNextCall();
+  void abortQSO();
   bool isWorked(int itype, QString key, float fMHz=0, QString="");
 
   QString save_wave_file (QString const& name