Merge pull request #550 from drowe67/ms-ux-cat-control

Improve labeling of PTT/CAT control options.
drowe67 · Sep 21, 2023 · 1ae7da8 · 1ae7da8
2 parents 239d608 + 19126dc
commit 1ae7da8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -129,9 +129,9 @@ Hitting **Refresh** in the lower left hand corner of the Tools/Audio Config will
 
 Another solution is to re-start FreeDV and check Tools/Audio Config again after changing any audio hardware.
 
-### PTT Configuration
+### CAT/PTT Configuration
 
-The Tools - PTT dialog supports three different ways to control PTT on
+The Tools->CAT and PTT Config dialog supports three different ways to control PTT on
 your radio:
 
 + VOX: sends a tone to the left channel of the Transmit/To Radio sound card
@@ -797,11 +797,11 @@ seconds.
 
 ## PTT doesn't work.  It works with Fldigi and other Hamlib applications.
 
-Many people struggle with initial PTT setup:
+Many people struggle with initial CAT control and PTT setup:
 
-1. Read the PTT Configuration section above.
+1. Read the "CAT/PTT Configuration" section above.
 
-1. Try the Tools - PTT Test function.
+1. Try the "Test PTT" button inside Tools->CAT and PTT Config.
 
 1. Check your rig serial settings.  Did you change them from defaults
 for another program?
@@ -918,6 +918,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
     * FreeDV Reporter: Fix regression preventing proper display of "RX Only" stations. (PR #542)
     * Default to the audio from the current TX mode if no modes decode (works around Codec2 bug with 1600 mode). (PR #544)
     * Fix bug preventing proper restore of selected tabs. (PR #548)
+    * Improve labeling of PTT/CAT control options. (PR #550)
     * Clarify behavior of "On Top" menu option. (PR #549)
 2. Enhancements:
     * Add configuration for background/foreground colors in FreeDV Reporter. (PR #545)

diff --git a/src/dlg_ptt.cpp b/src/dlg_ptt.cpp
@@ -64,7 +64,7 @@ ComPortsDlg::ComPortsDlg(wxWindow* parent, wxWindowID id, const wxString& title,
 
     /* Use Hamlib for PTT checkbox. */
 
-    m_ckUseHamlibPTT = new wxCheckBox(hamlibBox, wxID_ANY, _("Use Hamlib PTT"), wxDefaultPosition, wxSize(-1, -1), 0);
+    m_ckUseHamlibPTT = new wxCheckBox(hamlibBox, wxID_ANY, _("Enable CAT control via Hamlib"), wxDefaultPosition, wxSize(-1, -1), 0);
     m_ckUseHamlibPTT->SetValue(false);
     gridSizerhl->Add(m_ckUseHamlibPTT, 0, wxALIGN_CENTER_VERTICAL, 0);
     gridSizerhl->Add(new wxStaticText(hamlibBox, -1, wxT("")), 0, wxEXPAND);

diff --git a/src/dlg_ptt.h b/src/dlg_ptt.h
@@ -45,7 +45,7 @@
 class ComPortsDlg : public wxDialog
 {
      public:
-        ComPortsDlg(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PTT Config"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(450,300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
+        ComPortsDlg(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("CAT and PTT Config"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(450,300), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER);
         virtual ~ComPortsDlg();
         void    ExchangeData(int inout);
 

diff --git a/src/topFrame.cpp b/src/topFrame.cpp
@@ -363,7 +363,7 @@ TopFrame::TopFrame(wxWindow* parent, wxWindowID id, const wxString& title, const
     tools->Append(m_menuItemAudio);
 
     wxMenuItem* m_menuItemRigCtrlCfg;
-    m_menuItemRigCtrlCfg = new wxMenuItem(tools, wxID_ANY, wxString(_("P&TT Config...")) , _("Configures FreeDV integration with radio"), wxITEM_NORMAL);
+    m_menuItemRigCtrlCfg = new wxMenuItem(tools, wxID_ANY, wxString(_("CAT and P&TT Config...")) , _("Configures FreeDV integration with radio"), wxITEM_NORMAL);
     tools->Append(m_menuItemRigCtrlCfg);
 
     wxMenuItem* m_menuItemOptions;