Merge branch 'master' into ms-free-form-text-tooltip

drowe67 · Jan 24, 2024 · 5425c7a · 5425c7a
2 parents f846406 + 4803687
commit 5425c7a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -896,6 +896,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 2. Enhancements:
     * Add Frequency column to RX drop-down. (PR #663)
     * Update tooltip for the free form text field to indicate that it's not covered by FEC. (PR #665)
+    * Enable use of space bar for PTT when in the FreeDV Reporter window. (PR #666)
 3. Code cleanup:
     * Move FreeDV Reporter dialog code to dialogs section of codebase. (PR #664)
 

diff --git a/src/gui/dialogs/freedv_reporter.cpp b/src/gui/dialogs/freedv_reporter.cpp
@@ -392,6 +392,11 @@ FreeDVReporterDialog::~FreeDVReporterDialog()
     m_bandFilter->Disconnect(wxEVT_TEXT, wxCommandEventHandler(FreeDVReporterDialog::OnBandFilterChange), NULL, this);
 }
 
+bool FreeDVReporterDialog::isTextMessageFieldInFocus()
+{
+    return m_statusMessage->HasFocus();
+}
+
 void FreeDVReporterDialog::refreshLayout()
 {
     int colOffset = 0;

diff --git a/src/gui/dialogs/freedv_reporter.h b/src/gui/dialogs/freedv_reporter.h
@@ -68,6 +68,8 @@ class FreeDVReporterDialog : public wxDialog
 
         void setBandFilter(FilterFrequency freq);
 
+        bool isTextMessageFieldInFocus();
+
     protected:
 
         // Handlers for events.

diff --git a/src/ongui.cpp b/src/ongui.cpp
@@ -787,7 +787,12 @@ int MainApp::FilterEvent(wxEvent& event)
         (((wxKeyEvent&)event).GetKeyCode() == WXK_SPACE))
         {
             // only use space to toggle PTT if we are running and no modal dialogs (like options) up
-            if (frame->m_RxRunning && frame->IsActive() && wxGetApp().appConfiguration.enableSpaceBarForPTT && !frame->isReceiveOnly()) {
+            bool mainWindowActive = frame->IsActive();
+            bool reporterActiveButNotUpdatingTextMessage = 
+                frame->m_reporterDialog != nullptr && frame->m_reporterDialog->IsActive() && 
+                !frame->m_reporterDialog->isTextMessageFieldInFocus();
+            if (frame->m_RxRunning && (mainWindowActive || reporterActiveButNotUpdatingTextMessage) && 
+                wxGetApp().appConfiguration.enableSpaceBarForPTT && !frame->isReceiveOnly()) {
 
                 // space bar controls rx/rx if keyer not running
                 if (frame->vk_state == VK_IDLE) {