diff --git a/src/recorder/jamcontroller.cpp b/src/recorder/jamcontroller.cpp index b243bb2fd7..e1369c676c 100644 --- a/src/recorder/jamcontroller.cpp +++ b/src/recorder/jamcontroller.cpp @@ -91,7 +91,7 @@ void CJamController::SetRecordingDir ( QString newRecordingDir, int iServerFrame { pJamRecorder = new recorder::CJamRecorder ( newRecordingDir, iServerFrameSizeSamples ); strRecorderErrMsg = pJamRecorder->Init(); - bRecorderInitialised = ( strRecorderErrMsg == QString::null ); + bRecorderInitialised = ( strRecorderErrMsg == QString() ); bEnableRecording = bRecorderInitialised && !bDisableRecording; qInfo() << qUtf8Printable ( QString ( "Recording state: %1" ).arg ( bEnableRecording ? "enabled" : "disabled" ) ); @@ -99,7 +99,7 @@ void CJamController::SetRecordingDir ( QString newRecordingDir, int iServerFrame else { // This is the only time this is ever true - UI needs to handle it - strRecorderErrMsg = QString::null; + strRecorderErrMsg = QString(); bRecorderInitialised = false; bEnableRecording = false; diff --git a/src/recorder/jamrecorder.cpp b/src/recorder/jamrecorder.cpp index 69cb576523..95294ae428 100644 --- a/src/recorder/jamrecorder.cpp +++ b/src/recorder/jamrecorder.cpp @@ -359,11 +359,11 @@ QMap> CJamSession::TracksFromSessionDir ( const QStri /** * @brief CJamRecorder::Init Create recording directory, if necessary, and connect signal handlers * @param server Server object emitting signals - * @return QString::null on success else the failure reason + * @return QString() on success else the failure reason */ QString CJamRecorder::Init() { - QString errmsg = QString::null; + QString errmsg = QString(); QFileInfo fi ( recordBaseDir.absolutePath() ); fi.setCaching ( false ); diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index bfd6718657..f314fa857b 100644 Binary files a/src/res/translation/translation_de_DE.qm and b/src/res/translation/translation_de_DE.qm differ diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts index 07421eccfb..15c955b951 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -3631,13 +3631,13 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion 'Stummschalten&apos - Recording has been switched off by the UI checkbox - Die Aufnahme wurde über die Checkbox in der Benutzeroberfläche ausgeschaltet + Recording has been switched off by the UI checkbox. + Die Aufnahme wurde über die Checkbox in der Benutzeroberfläche ausgeschaltet. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - Die Aufnahme wurde entweder durch eine Auswahl in der Benutzeroberfläche oder das SIGUSR2 Signal beendet + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + Die Aufnahme wurde entweder durch eine Auswahl in der Benutzeroberfläche oder das SIGUSR2 Signal beendet. @@ -3731,8 +3731,8 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion 'Stummschalten&apos - No recording directory has been set or the value is not useable - Es wurde kein Aufnahmeverzeichnis gesetzt oder es wurde ein ungültiges Aufnahmeverzeichnis angegeben + No recording directory has been set or the value is not useable. + Es wurde kein Aufnahmeverzeichnis gesetzt oder es wurde ein ungültiges Aufnahmeverzeichnis angegeben. Recording has been switched off @@ -3748,13 +3748,13 @@ Wir haben Deinen Kanal stummgeschaltet und die Funktion 'Stummschalten&apos - There is no one connected to the server to record - Es ist kein Musiker mit dem Server verbunden + There is no one connected to the server to record. + Es ist kein Musiker mit dem Server verbunden. - The performers are being recorded to the specified session directory - Die Aufnahme ist aktiv + The performers are being recorded to the specified session directory. + Die Aufnahme ist aktiv. diff --git a/src/res/translation/translation_es_ES.qm b/src/res/translation/translation_es_ES.qm index 528152369f..6a2c7c5522 100644 Binary files a/src/res/translation/translation_es_ES.qm and b/src/res/translation/translation_es_ES.qm differ diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index 22b1070129..b1d846d08f 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -3691,13 +3691,13 @@ Hemos silenciado tu canal y activado 'Silenciarme Yo'. Por favor resue - Recording has been switched off by the UI checkbox - La grabación se ha apagado con la casilla de la interfaz gráfica + Recording has been switched off by the UI checkbox. + La grabación se ha apagado con la casilla de la interfaz gráfica. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - La grabación se ha apagado, bien a través de la casilla de la interfaz gráfica o por haber recibido SIGUSR2 + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + La grabación se ha apagado, bien a través de la casilla de la interfaz gráfica o por haber recibido SIGUSR2. @@ -3791,8 +3791,8 @@ Hemos silenciado tu canal y activado 'Silenciarme Yo'. Por favor resue - No recording directory has been set or the value is not useable - No se ha establecido ningún directorio de grabación o el valor no es utilizable + No recording directory has been set or the value is not useable. + No se ha establecido ningún directorio de grabación o el valor no es utilizable. Recording has been switched off @@ -3808,13 +3808,13 @@ Hemos silenciado tu canal y activado 'Silenciarme Yo'. Por favor resue - There is no one connected to the server to record - No hay nadie conectado al servidor para grabar + There is no one connected to the server to record. + No hay nadie conectado al servidor para grabar. - The performers are being recorded to the specified session directory - Los intérpretes están siendo grabados al directorio de sesión especificado + The performers are being recorded to the specified session directory. + Los intérpretes están siendo grabados al directorio de sesión especificado. diff --git a/src/res/translation/translation_fr_FR.qm b/src/res/translation/translation_fr_FR.qm index 2c9621265c..b7ff6f82e1 100644 Binary files a/src/res/translation/translation_fr_FR.qm and b/src/res/translation/translation_fr_FR.qm differ diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index 8835fd1d5d..5623f33319 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -3206,8 +3206,8 @@ Nous avons coupé votre canal et activé "Me silencer". Veuillez d&apo - No recording directory has been set or the value is not useable - Aucun répertoire d'enregistrement n'a été défini ou la valeur n'est pas utilisable + No recording directory has been set or the value is not useable. + Aucun répertoire d'enregistrement n'a été défini ou la valeur n'est pas utilisable. Recording has been switched off @@ -3223,13 +3223,13 @@ Nous avons coupé votre canal et activé "Me silencer". Veuillez d&apo - There is no one connected to the server to record - Il n'y a personne connecté au serveur pour enregistrer + There is no one connected to the server to record. + Il n'y a personne connecté au serveur pour enregistrer. - The performers are being recorded to the specified session directory - Les interprètes sont enregistrés dans le répertoire de session spécifié + The performers are being recorded to the specified session directory. + Les interprètes sont enregistrés dans le répertoire de session spécifié. @@ -3348,12 +3348,12 @@ Nous avons coupé votre canal et activé "Me silencer". Veuillez d&apo - Recording has been switched off by the UI checkbox + Recording has been switched off by the UI checkbox. L'enregistrement a été désactivé par la case à cocher de l'interface utilisateur - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. L'enregistrement a été désactivé, soit par la case à cocher de l'interface utilisateur, soit par la réception de SIGUSR2 diff --git a/src/res/translation/translation_it_IT.qm b/src/res/translation/translation_it_IT.qm index 91a1445b9b..1e6822f151 100644 Binary files a/src/res/translation/translation_it_IT.qm and b/src/res/translation/translation_it_IT.qm differ diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 2d3cb1f2b6..d10b3678b7 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -3640,13 +3640,13 @@ E' stato disattivato l'audio del tuo canale ed inserito il "Disat - Recording has been switched off by the UI checkbox - La registrazione è stata fermata mediante il box presente sull'interfaccia + Recording has been switched off by the UI checkbox. + La registrazione è stata fermata mediante il box presente sull'interfaccia. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - La registrazione è stata fermata mediante il box presente sull'interfaccia oppure dalla ricezione del segnale SIGUSR2 + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + La registrazione è stata fermata mediante il box presente sull'interfaccia oppure dalla ricezione del segnale SIGUSR2. @@ -3740,8 +3740,8 @@ E' stato disattivato l'audio del tuo canale ed inserito il "Disat - No recording directory has been set or the value is not useable - Cartella per la registrazione non settata o non utilizzabile + No recording directory has been set or the value is not useable. + Cartella per la registrazione non settata o non utilizzabile. Recording has been switched off @@ -3757,13 +3757,13 @@ E' stato disattivato l'audio del tuo canale ed inserito il "Disat - There is no one connected to the server to record - Non c'è nessuno collegato al server per registrare + There is no one connected to the server to record. + Non c'è nessuno collegato al server per registrare. - The performers are being recorded to the specified session directory - Gli artisti vengono registrati nella directory della sessione specificata + The performers are being recorded to the specified session directory. + Gli artisti vengono registrati nella directory della sessione specificata. diff --git a/src/res/translation/translation_nl_NL.qm b/src/res/translation/translation_nl_NL.qm index 2bd50508d6..bc9c147042 100644 Binary files a/src/res/translation/translation_nl_NL.qm and b/src/res/translation/translation_nl_NL.qm differ diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index ebf7ecf409..ac104f37a3 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -3635,13 +3635,13 @@ We hebben uw kanaal gedempt en 'Demp mijzelf' geactiveerd. Los eerst h - Recording has been switched off by the UI checkbox - Opname is uitgeschakeld middels het vinkje in het venster + Recording has been switched off by the UI checkbox. + Opname is uitgeschakeld middels het vinkje in het venster. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - Opname is uitgeschakeld middels het vinkje in het venster of doordat het SIGUSR2 signaal is ontvangen + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + Opname is uitgeschakeld middels het vinkje in het venster of doordat het SIGUSR2 signaal is ontvangen. @@ -3735,8 +3735,8 @@ We hebben uw kanaal gedempt en 'Demp mijzelf' geactiveerd. Los eerst h - No recording directory has been set or the value is not useable - Geen geluidsopnamedirectory ingesteld of waarde is niet bruikbaar + No recording directory has been set or the value is not useable. + Geen geluidsopnamedirectory ingesteld of waarde is niet bruikbaar. Recording has been switched off @@ -3752,13 +3752,13 @@ We hebben uw kanaal gedempt en 'Demp mijzelf' geactiveerd. Los eerst h - There is no one connected to the server to record - Er is niemand verbonden met de server voor geluidsopname + There is no one connected to the server to record. + Er is niemand verbonden met de server voor geluidsopname. - The performers are being recorded to the specified session directory - Het geluid van de muzikanten wordt opgenomen in de aangegeven sessie-directory + The performers are being recorded to the specified session directory. + Het geluid van de muzikanten wordt opgenomen in de aangegeven sessie-directory. diff --git a/src/res/translation/translation_pl_PL.qm b/src/res/translation/translation_pl_PL.qm index 69bc344c22..5ab7334c8d 100644 Binary files a/src/res/translation/translation_pl_PL.qm and b/src/res/translation/translation_pl_PL.qm differ diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index 5ab6c71a8d..68ad8a79a3 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -3229,13 +3229,13 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę - Recording has been switched off by the UI checkbox - Nagrywanie zostało wyłączone przez użytkownika + Recording has been switched off by the UI checkbox. + Nagrywanie zostało wyłączone przez użytkownika. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - Nagrywanie zostało wyłączone przez użytkownika lub otrzymano komunikat SIGUSR2 + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + Nagrywanie zostało wyłączone przez użytkownika lub otrzymano komunikat SIGUSR2. @@ -3403,8 +3403,8 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę - No recording directory has been set or the value is not useable - Nie wybrano katalogu nagrywania lub nie da się go używać + No recording directory has been set or the value is not useable. + Nie wybrano katalogu nagrywania lub nie da się go używać. Recording has been switched off @@ -3420,13 +3420,13 @@ Twój kanał został wyciszony i włączono „Wycisz mnie”. Napraw przyczynę - There is no one connected to the server to record - Nikt nie jest podłączony do serwera żeby nagrywać + There is no one connected to the server to record. + Nikt nie jest podłączony do serwera żeby nagrywać. - The performers are being recorded to the specified session directory - Wykonawcy są nagrywani do wybranego katalogu + The performers are being recorded to the specified session directory. + Wykonawcy są nagrywani do wybranego katalogu. diff --git a/src/res/translation/translation_pt_BR.qm b/src/res/translation/translation_pt_BR.qm index 2ad2a2bd18..a3b2fedf26 100644 Binary files a/src/res/translation/translation_pt_BR.qm and b/src/res/translation/translation_pt_BR.qm differ diff --git a/src/res/translation/translation_pt_BR.ts b/src/res/translation/translation_pt_BR.ts index ba1a1f9f60..20e837716a 100644 --- a/src/res/translation/translation_pt_BR.ts +++ b/src/res/translation/translation_pt_BR.ts @@ -3665,13 +3665,13 @@ Silenciamos seu canal e ativamos 'Silenciar-me'. Resolva o problema de - Recording has been switched off by the UI checkbox - Gravação foi desligada pela caixa de seleção da IU + Recording has been switched off by the UI checkbox. + Gravação foi desligada pela caixa de seleção da IU. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - Gravação foi desligada pela caixa de seleção da IU ou SIGUSR2 recebido + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + Gravação foi desligada pela caixa de seleção da IU ou SIGUSR2 recebido. @@ -3765,8 +3765,8 @@ Silenciamos seu canal e ativamos 'Silenciar-me'. Resolva o problema de - No recording directory has been set or the value is not useable - Nenhum diretório de gravação definido ou o valor não é utilizável + No recording directory has been set or the value is not useable. + Nenhum diretório de gravação definido ou o valor não é utilizável. Recording has been switched off @@ -3782,13 +3782,13 @@ Silenciamos seu canal e ativamos 'Silenciar-me'. Resolva o problema de - There is no one connected to the server to record - Não há ninguém conectado ao servidor para gravar + There is no one connected to the server to record. + Não há ninguém conectado ao servidor para gravar. - The performers are being recorded to the specified session directory - Os artistas estão sendo gravados no diretório de sessão especificado + The performers are being recorded to the specified session directory. + Os artistas estão sendo gravados no diretório de sessão especificado. diff --git a/src/res/translation/translation_pt_PT.qm b/src/res/translation/translation_pt_PT.qm index e4b58a1bee..ca13552e99 100644 Binary files a/src/res/translation/translation_pt_PT.qm and b/src/res/translation/translation_pt_PT.qm differ diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index 1fa7022ed2..6f71106d6d 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -3623,13 +3623,13 @@ O seu canal foi silenciado e foi activada a função 'Silenciar-me'. P - Recording has been switched off by the UI checkbox - As gravações foram desactivadas pela caixa de seleção da IU + Recording has been switched off by the UI checkbox. + As gravações foram desactivadas pela caixa de seleção da IU. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - As gravações foram desactivadas pela caixa de seleção da IU ou por sinal SIGUSR2 ser recebido + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + As gravações foram desactivadas pela caixa de seleção da IU ou por sinal SIGUSR2 ser recebido. @@ -3723,8 +3723,8 @@ O seu canal foi silenciado e foi activada a função 'Silenciar-me'. P - No recording directory has been set or the value is not useable - O directório de gravaçãos não foi definido ou não é utilizável + No recording directory has been set or the value is not useable. + O directório de gravaçãos não foi definido ou não é utilizável. Recording has been switched off @@ -3740,13 +3740,13 @@ O seu canal foi silenciado e foi activada a função 'Silenciar-me'. P - There is no one connected to the server to record - Não está ninguém ligado ao servidor para gravar + There is no one connected to the server to record. + Não está ninguém ligado ao servidor para gravar. - The performers are being recorded to the specified session directory - Os artistas estão a ser gravados para o directório de sessão especificado + The performers are being recorded to the specified session directory. + Os artistas estão a ser gravados para o directório de sessão especificado. diff --git a/src/res/translation/translation_sk_SK.qm b/src/res/translation/translation_sk_SK.qm index 26cbb57573..97aa86372a 100644 Binary files a/src/res/translation/translation_sk_SK.qm and b/src/res/translation/translation_sk_SK.qm differ diff --git a/src/res/translation/translation_sk_SK.ts b/src/res/translation/translation_sk_SK.ts index 0c1a530d49..5baa5a5b9b 100644 --- a/src/res/translation/translation_sk_SK.ts +++ b/src/res/translation/translation_sk_SK.ts @@ -3106,13 +3106,13 @@ Stíšili sme váš kanál a aktivovali nastavenia 'Stíšiť ma'. Pro - Recording has been switched off by the UI checkbox - Nahrávanie bolo vypnuté pomocou začiarkavacieho políčka + Recording has been switched off by the UI checkbox. + Nahrávanie bolo vypnuté pomocou začiarkavacieho políčka. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - Nahrávanie bolo vypnuté, buď prostredníctvom začiarkavacieho políčka alebo bol prijatý signál SIGUSR2 + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + Nahrávanie bolo vypnuté, buď prostredníctvom začiarkavacieho políčka alebo bol prijatý signál SIGUSR2. @@ -3278,17 +3278,17 @@ Stíšili sme váš kanál a aktivovali nastavenia 'Stíšiť ma'. Pro - No recording directory has been set or the value is not useable + No recording directory has been set or the value is not useable. - There is no one connected to the server to record + There is no one connected to the server to record. - The performers are being recorded to the specified session directory + The performers are being recorded to the specified session directory. diff --git a/src/res/translation/translation_sv_SE.qm b/src/res/translation/translation_sv_SE.qm index 8c3b5ce258..5023e573ed 100644 Binary files a/src/res/translation/translation_sv_SE.qm and b/src/res/translation/translation_sv_SE.qm differ diff --git a/src/res/translation/translation_sv_SE.ts b/src/res/translation/translation_sv_SE.ts index bd246be972..c89c4e9486 100644 --- a/src/res/translation/translation_sv_SE.ts +++ b/src/res/translation/translation_sv_SE.ts @@ -3145,13 +3145,13 @@ Vi stängde av din kanal och aktiverade 'Tysta mig själv'. Vänligen - Recording has been switched off by the UI checkbox - Inspelningen har stängts av av kryssrutan UI + Recording has been switched off by the UI checkbox. + Inspelningen har stängts av av kryssrutan UI. - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received - Inspelningen har stängts av, antingen genom att kryssrutan UI eller SIGUSR2 har tagits emot + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. + Inspelningen har stängts av, antingen genom att kryssrutan UI eller SIGUSR2 har tagits emot. @@ -3366,8 +3366,8 @@ Vi stängde av din kanal och aktiverade 'Tysta mig själv'. Vänligen - No recording directory has been set or the value is not useable - Ingen inspelningskatalog har ställts in eller värdet kan inte användas + No recording directory has been set or the value is not useable. + Ingen inspelningskatalog har ställts in eller värdet kan inte användas. Recording has been switched off @@ -3383,13 +3383,13 @@ Vi stängde av din kanal och aktiverade 'Tysta mig själv'. Vänligen - There is no one connected to the server to record - Det är ingen ansluten till servern att spela in + There is no one connected to the server to record. + Det är ingen ansluten till servern att spela in. - The performers are being recorded to the specified session directory - Artisterna spelas in i den angivna sessionskatalogen + The performers are being recorded to the specified session directory. + Artisterna spelas in i den angivna sessionskatalogen. diff --git a/src/res/translation/translation_zh_CN.qm b/src/res/translation/translation_zh_CN.qm index 13c384689b..5e27a73ab5 100644 Binary files a/src/res/translation/translation_zh_CN.qm and b/src/res/translation/translation_zh_CN.qm differ diff --git a/src/res/translation/translation_zh_CN.ts b/src/res/translation/translation_zh_CN.ts index b882632976..b5d7c2efc4 100644 --- a/src/res/translation/translation_zh_CN.ts +++ b/src/res/translation/translation_zh_CN.ts @@ -2630,12 +2630,12 @@ We muted your channel and activated 'Mute Myself'. Please solve the fe - Recording has been switched off by the UI checkbox + Recording has been switched off by the UI checkbox. 录制已通过界面的勾选框关闭 - Recording has been switched off, either by the UI checkbox or SIGUSR2 being received + Recording has been switched off, either by the UI checkbox or SIGUSR2 being received. 录制已因界面的勾选框或因程序收到 SIGUSR2 信号而关闭 @@ -2746,7 +2746,7 @@ We muted your channel and activated 'Mute Myself'. Please solve the fe - No recording directory has been set or the value is not useable + No recording directory has been set or the value is not useable. 没有设置录制目录或填写的路径不可用 @@ -2755,12 +2755,12 @@ We muted your channel and activated 'Mute Myself'. Please solve the fe - There is no one connected to the server to record + There is no one connected to the server to record. 没有人连接到服务器以供录制 - The performers are being recorded to the specified session directory + The performers are being recorded to the specified session directory. 演奏已被录制到会话所对应的目录中 diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp index 1fce7e5a10..f467a2f22b 100644 --- a/src/serverdlg.cpp +++ b/src/serverdlg.cpp @@ -121,32 +121,39 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b tr ( "Checked when the recorder is enabled, otherwise unchecked. " "The recorder will run when a session is in progress, if (set up correctly and) enabled." ) ); - // current session directory - edtCurrentSessionDir->setAccessibleName ( tr ( "Current session directory text box (read-only)" ) ); - edtCurrentSessionDir->setWhatsThis ( "" + tr ( "Current Session Directory" ) + ": " + - tr ( "Enabled during recording and holds the current recording session directory. " - "Disabled after recording or when the recorder is not enabled." ) ); + // new recording + pbtNewRecording->setAccessibleName ( tr ( "Request new recording button" ) ); + pbtNewRecording->setWhatsThis ( "" + tr ( "New Recording" ) + ": " + + tr ( "During a recording session, the button can be used to start a new recording." ) ); // 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:" ) + - "
" + "
" + SREC_NOT_INITIALISED + "
" + "
" + tr ( "No recording directory has been set or the value is not useable" ) + + "
" + "
" + SREC_NOT_INITIALISED + "
" + "
" + + tr ( "No recording directory has been set or the value is not useable. " + "Check the value in the Options tab." ) + "
" + "
" + SREC_NOT_ENABLED + "
" + "
" #ifdef _WIN32 - + tr ( "Recording has been switched off by the UI checkbox" ) + + tr ( "Recording has been switched off by the UI checkbox." ) #else - + tr ( "Recording has been switched off, either by the UI checkbox or SIGUSR2 being received" ) + + tr ( "Recording has been switched off, either by the UI checkbox or SIGUSR2 being received." ) #endif - + "
" + "
" + SREC_NOT_RECORDING + "
" + "
" + tr ( "There is no one connected to the server to record" ) + "
" + "
" + - SREC_RECORDING + "
" + "
" + tr ( "The performers are being recorded to the specified session directory" ) + "
" + "
" + + + "
" + "
" + SREC_NOT_RECORDING + "
" + "
" + tr ( "There is no one connected to the server to record." ) + "
" + "
" + + 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." ) ); + tr ( "If the recording directory is not useable, the problem will be displayed in place of the session directory." ) ); - // new recording - pbtNewRecording->setAccessibleName ( tr ( "Request new recording button" ) ); - pbtNewRecording->setWhatsThis ( "" + tr ( "New Recording" ) + ": " + - tr ( "During a recording session, the button can be used to start a new recording." ) ); + // current session directory + QString strCurrentSessionDirAN = tr ( "Current session directory text box (read-only)" ); + lblCurrentSessionDir->setAccessibleName ( strCurrentSessionDirAN ); + edtCurrentSessionDir->setAccessibleName ( strCurrentSessionDirAN ); + + QString strCurrentSessionDirWT = "" + tr ( "Current Session Directory" ) + ": " + + tr ( "Enabled during recording and holds the current recording session directory. " + "Disabled after recording or when the recorder is not enabled." ); + lblCurrentSessionDir->setWhatsThis ( strCurrentSessionDirWT ); + edtCurrentSessionDir->setWhatsThis ( strCurrentSessionDirWT ); // welcome message tedWelcomeMessage->setAccessibleName ( tr ( "Server welcome message edit box" ) ); @@ -364,7 +371,7 @@ lvwClients->setMinimumHeight ( 140 ); // update GUI dependencies UpdateGUIDependencies(); - UpdateRecorderStatus ( QString::null ); + UpdateRecorderStatus ( QString() ); // View menu -------------------------------------------------------------- QMenu* pViewMenu = new QMenu ( tr ( "&Window" ), this ); @@ -550,19 +557,19 @@ void CServerDlg::OnDirectoryTypeCurrentIndexChanged ( int iTypeIdx ) void CServerDlg::OnServerStarted() { UpdateSystemTrayIcon ( true ); - UpdateRecorderStatus ( QString::null ); + UpdateRecorderStatus ( QString() ); } void CServerDlg::OnServerStopped() { UpdateSystemTrayIcon ( false ); - UpdateRecorderStatus ( QString::null ); + UpdateRecorderStatus ( QString() ); } void CServerDlg::OnStopRecorder() { - UpdateRecorderStatus ( QString::null ); - if ( pServer->GetRecorderErrMsg() != QString::null ) + UpdateRecorderStatus ( QString() ); + if ( pServer->GetRecorderErrMsg() != QString() ) { QMessageBox::warning ( this, APP_NAME, @@ -585,16 +592,16 @@ void CServerDlg::OnRecordingDirClicked() if ( newRecordingDir != currentValue ) { pServer->SetRecordingDir ( newRecordingDir ); - UpdateRecorderStatus ( QString::null ); + UpdateRecorderStatus ( QString() ); } } void CServerDlg::OnClearRecordingDirClicked() { - if ( pServer->GetRecorderErrMsg() != QString::null || pServer->GetRecordingDir() != "" ) + if ( pServer->GetRecorderErrMsg() != QString() || pServer->GetRecordingDir() != "" ) { pServer->SetRecordingDir ( "" ); - UpdateRecorderStatus ( QString::null ); + UpdateRecorderStatus ( QString() ); } } @@ -821,7 +828,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir ) { if ( pServer->IsRunning() ) { - edtCurrentSessionDir->setText ( sessionDir != QString::null ? sessionDir : "" ); + edtCurrentSessionDir->setText ( sessionDir != QString() ? sessionDir : "" ); strRecorderStatus = SREC_RECORDING; bIsRecording = true; @@ -840,7 +847,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir ) { strRecordingDir = pServer->GetRecorderErrMsg(); - if ( strRecordingDir == QString::null ) + if ( strRecordingDir == QString() ) { strRecordingDir = pServer->GetRecordingDir(); } diff --git a/src/serverdlgbase.ui b/src/serverdlgbase.ui index b92d70decc..2a7afacada 100644 --- a/src/serverdlgbase.ui +++ b/src/serverdlgbase.ui @@ -161,23 +161,40 @@ - - - true + + + New Recording + + + 0 + 0 + + STATUS + + + + - + - New Recording + Session + + + + + + + true