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 ( "" + tr ( "Recorder Status" ) + ": " - + tr ( "Displays the current status of the recorder. The following values are possible:" - "
" - "
Not initialised
" - "
No recording directory has been set or the value is not useable
" - "
Not enabled
" - "
Recording has been switched off" ) + + tr ( "Displays the current status of the recorder. The following values are possible:" ) + + "
" + + "
" + tr ( SREC_NOT_INITIALISED ) + "
" + + "
" + tr ( "No recording directory has been set or the value is not useable" ) + "
" + + "
" + tr ( SREC_NOT_ENABLED ) + "
" + + "
" + tr ( "Recording has been switched off" ) #ifdef _WIN32 - + tr ( " by the UI checkbox
" ) + + tr ( " by the UI checkbox" ) #else - + tr ( ", either by the UI checkbox or SIGUSR2 being received
" ) + + tr ( ", either by the UI checkbox or SIGUSR2 being received" ) #endif - + tr ( "
Not recording
" - "
There is no one connected to the server to record
" - "
Recording
" - "
The performers are being recorded to the specified session directory
" - "
" ) - + tr ( "
NOTE: If the recording directory is not useable, " - "the problem will be displayed in place of the directory.") ); + + "" + + "
" + tr ( SREC_NOT_RECORDING ) + "
" + + "
" + tr ( "There is no one connected to the server to record" ) + "
" + + "
" + tr ( SREC_RECORDING ) + "
" + + "
" + tr ( "The performers are being recorded to the specified session directory" ) + "
" + + "" + + "
" + tr ( "NOTE" ) + ": " + + 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