From 3b93e67f931275aa5f7271653bbadbfeda89d65a Mon Sep 17 00:00:00 2001
From: Peter L Jones <peter@drealm.info>
Date: Wed, 1 Jul 2020 16:13:42 +0100
Subject: [PATCH] Changes for recorder status and whatsthis

---
 ChangeLog         |  2 ++
 src/serverdlg.cpp | 39 ++++++++++++++++++++-------------------
 src/serverdlg.h   |  6 ++++++
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1dc7efff..da33eba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 
 3.5.9git
 
+- update server UI to allow setting the jam recorder directory (like -R) (#228, #405)
+
 - new app icon for Jamulus, created by geheimerEichkater (#410)
 
 - bug fix: grouping faders in the client should be proportional (see discussion in #202, #419)
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 76a4b8a6..e80000d4 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -157,24 +157,25 @@ CServerDlg::CServerDlg ( CServer*         pNServP,
     // recorder status
     lblRecorderStatus->setAccessibleName ( tr ( "Recorder status label" ) );
     lblRecorderStatus->setWhatsThis ( "<b>" + tr ( "Recorder Status" ) + ":</b> "
-        + tr ( "Displays the current status of the recorder.  The following values are possible:"
-               "<dl>"
-               "<dt>Not initialised</dt>"
-               "<dd>No recording directory has been set or the value is not useable</dd>"
-               "<dt>Not enabled</dt>"
-               "<dd>Recording has been switched off" )
+        + tr ( "Displays the current status of the recorder.  The following values are possible:" )
+        + "<dl>"
+        + "<dt>" + tr ( SREC_NOT_INITIALISED ) + "</dt>"
+        + "<dd>" + tr ( "No recording directory has been set or the value is not useable" ) + "</dd>"
+        + "<dt>" + tr ( SREC_NOT_ENABLED ) + "</dt>"
+        + "<dd>" + tr ( "Recording has been switched off" )
 #ifdef _WIN32
-         + tr ( " by the UI checkbox</dd>" )
+        + tr ( " by the UI checkbox" )
 #else
-         + tr ( ", either by the UI checkbox or SIGUSR2 being received</dd>" )
+        + tr ( ", either by the UI checkbox or SIGUSR2 being received" )
 #endif
-         + tr ( "<dt>Not recording</dt>"
-                "<dd>There is no one connected to the server to record</dd>"
-                "<dt>Recording</dt>"
-                "<dd>The performers are being recorded to the specified session directory</dd>"
-                "</dl>" )
-        + tr ( "<br/><b>NOTE:</b> If the recording directory is not useable, "
-               "the problem will be displayed in place of the directory.") );
+        + "</dd>"
+        + "<dt>" + tr ( SREC_NOT_RECORDING ) + "</dt>"
+        + "<dd>" + tr ( "There is no one connected to the server to record" ) + "</dd>"
+        + "<dt>" + tr ( SREC_RECORDING ) + "</dt>"
+        + "<dd>" + tr ( "The performers are being recorded to the specified session directory" ) + "</dd>"
+        + "</dl>"
+        + "<br/><b>" + tr ( "NOTE" ) + ":</b> "
+        + tr ( "If the recording directory is not useable, the problem will be displayed in place of the directory." ) );
 
     // new recording
     pbtNewRecording->setAccessibleName ( tr ( "Request new recording button" ) );
@@ -781,17 +782,17 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
             if ( pServer->IsRunning() )
             {
                 edtCurrentSessionDir->setText ( sessionDir != QString::null ? sessionDir : "" );
-                strRecorderStatus = tr ( "Recording" );
+                strRecorderStatus = tr ( SREC_RECORDING );
                 bIsRecording      = true;
             }
             else
             {
-                strRecorderStatus = tr ( "Not recording" );
+                strRecorderStatus = tr ( SREC_NOT_RECORDING );
             }
         }
         else
         {
-            strRecorderStatus = tr ( "Not enabled" );
+            strRecorderStatus = tr ( SREC_NOT_ENABLED );
         }
     }
     else
@@ -806,7 +807,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
             strRecordingDir = tr ( "ERROR" ) + ": " + strRecordingDir;
         }
         chbEnableRecorder->setEnabled ( false );
-        strRecorderStatus = tr ( "Not initialised" );
+        strRecorderStatus = tr ( SREC_NOT_INITIALISED );
     }
 
     edtRecordingDir->setText( strRecordingDir );
diff --git a/src/serverdlg.h b/src/serverdlg.h
index e4f7e603..3313a011 100755
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@@ -46,6 +46,12 @@
 // update time for GUI controls
 #define GUI_CONTRL_UPDATE_TIME      1000 // ms
 
+// Strings used in multiple places
+#define SREC_NOT_INITIALISED "Not initialised"
+#define SREC_NOT_ENABLED     "Not enabled"
+#define SREC_NOT_RECORDING   "Not recording"
+#define SREC_RECORDING       "Recording"
+
 
 /* Classes ********************************************************************/
 class CServerDlg : public QDialog, private Ui_CServerDlgBase