diff --git a/ChangeLog b/ChangeLog index 15f12bd7..4e9d9f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,9 @@ - support multithreading in the server to better support multi-core CPUs, use qmake "CONFIG+=multithreading" to enable the new multithreading (#339) -- option to set "Mute Myself" on with a command line argument (#495) +- option to set Mute Myself on with a command line argument (#495) + +- added a red message to indicate that Mute Myself is activated (#476) - replacing internal history graph functionality by external scripts/tools (#501) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 6f103a02..8528df8c 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -226,6 +226,10 @@ CClientDlg::CClientDlg ( CClient* pNCliP, // set window title (with no clients connected -> "0") SetMyWindowTitle ( 0 ); + // prepare Mute Myself info label (invisible by default) + lblGlobalInfoLabel->setStyleSheet ( ".QLabel { background: red; }" ); + lblGlobalInfoLabel->hide(); + // Connect on startup ------------------------------------------------------ if ( !strConnOnStartupAddress.isEmpty() ) @@ -934,6 +938,16 @@ void CClientDlg::OnChatStateChanged ( int value ) void CClientDlg::OnLocalMuteStateChanged ( int value ) { pClient->SetMuteOutStream ( value == Qt::Checked ); + + // show/hide info label + if ( value == Qt::Checked ) + { + lblGlobalInfoLabel->show(); + } + else + { + lblGlobalInfoLabel->hide(); + } } void CClientDlg::OnTimerSigMet() diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index 803d94d3..bbd87b9c 100755 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -541,14 +541,31 @@ - - - - 0 - 0 - - - + + + + + MUTED (You are not sending any audio to the server) + + + Qt::AlignCenter + + + 6 + + + + + + + + 0 + 0 + + + + + diff --git a/src/res/translation/translation_de_DE.qm b/src/res/translation/translation_de_DE.qm index d7ce1dd7..23939732 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 b67d99ba..a69e952a 100644 --- a/src/res/translation/translation_de_DE.ts +++ b/src/res/translation/translation_de_DE.ts @@ -790,52 +790,52 @@ - + C&onnect &Verbinden - + &File &Datei - + &View &Ansicht - + &Connection Setup... &Verbinden... - + My &Profile... Mein &Profil... - + C&hat... C&hat... - + &Settings... &Einstellungen... - + &Analyzer Console... - + E&xit &Beenden - + &Edit B&earbeiten @@ -848,18 +848,18 @@ Keine - + Center Mitte - + R - + L @@ -934,53 +934,53 @@ Die CPU des Computers ist voll ausgelastet. - + &Load Mixer Channels Setup... &Laden der Konfiguration der Mixerkanäle... - + &Save Mixer Channels Setup... &Speichern der Konfiguration der Mixerkanäle... - + Sort Channel Users by &Name Sortiere die Kanäle nach dem &Namen - + Sort Channel Users by &Instrument Sortiere die Kanäle nach dem &Instrument - + Sort Channel Users by &Group Sortiere die Kanäle nach der &Gruppe - + Central Server Zentralserver - - + + Select Channel Setup File Auswählen der Datei für die Konfiguration der Mixerkanäle - + user Musiker - + users Musiker - + D&isconnect &Trennen @@ -1057,6 +1057,11 @@ Right Rechts + + + MUTED (You are not sending any audio to the server) + Stumm (Es wird kein Ton zum Server gesendet) + CClientSettingsDlg diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts index ef09d9ba..029b408f 100644 --- a/src/res/translation/translation_es_ES.ts +++ b/src/res/translation/translation_es_ES.ts @@ -810,57 +810,57 @@ - + C&onnect C&onectar - + &File &Archivo - + &View &Ver - + &Connection Setup... &Configuración de Conexión... - + My &Profile... Mi &Perfil... - + C&hat... C&hat... - + &Settings... &Configuración... - + &Analyzer Console... &Analyzer Console... - + E&xit S&alir - + &Edit &Editar - + Sort Channel Users by &Group Ordenar Usuarios de Canal por &Grupo @@ -869,18 +869,18 @@ Ninguno - + Center Centro - + R R - + L L @@ -955,48 +955,48 @@ El procesador del cliente o del servidor está al 100%. - + &Load Mixer Channels Setup... &Cargar Configuración Canales Mezclador... - + &Save Mixer Channels Setup... &Guardar Configuración Canales Mezclador... - + Sort Channel Users by &Name Ordenar Canales por &Nombre - + Sort Channel Users by &Instrument Ordenar Canales por &Instrumento - + Central Server Servidor Central - - + + Select Channel Setup File Seleccionar Archivo Configuración Canales - + user usuario - + users usuarios - + D&isconnect D&esconectar @@ -1073,6 +1073,11 @@ Right Dcho + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts index d88e0e88..7d6abb10 100644 --- a/src/res/translation/translation_fr_FR.ts +++ b/src/res/translation/translation_fr_FR.ts @@ -806,52 +806,52 @@ - + C&onnect Se c&onnecter - + &File &Fichier - + &View &Vue - + &Connection Setup... Paramètres de &connexion... - + My &Profile... Mon &profil - + C&hat... Tc&hate... - + &Settings... Paramètre&s... - + &Analyzer Console... Console d'&analyse - + E&xit &Quitter - + &Edit Édit&er @@ -864,18 +864,18 @@ Aucun - + Center Centre - + R D - + L G @@ -950,53 +950,53 @@ Le processeur du client ou du serveur est à 100%. - + &Load Mixer Channels Setup... &Charger la configuration des canaux du mixeur... - + &Save Mixer Channels Setup... &Sauvegarder la configuration des canaux du mixeur... - + Sort Channel Users by &Name Trier les utilisateurs du canal par &nom - + Sort Channel Users by &Instrument Trier les utilisateurs du canal par &instrument - + Sort Channel Users by &Group Trier les utilisateurs des canaux par &groupe - + Central Server Serveur central - - + + Select Channel Setup File Sélectionnez le fichier de configuration des canaux - + user utilisateur - + users utilisateurs - + D&isconnect Dé&connecter @@ -1073,6 +1073,11 @@ Right Droite + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts index 014d84ba..83d69ecb 100644 --- a/src/res/translation/translation_it_IT.ts +++ b/src/res/translation/translation_it_IT.ts @@ -639,7 +639,7 @@ - + L L @@ -862,77 +862,77 @@ - + C&onnect C&onnetti - + &File &File - + &View &Vista - + &Connection Setup... Setup &Connessione... - + My &Profile... &Profilo Personale... - + C&hat... C&hat... - + &Settings... &Settaggi... - + &Analyzer Console... &Analizzatore... - + E&xit &Uscita - + &Load Mixer Channels Setup... &Carica Setup Mixer... - + &Save Mixer Channels Setup... &Salva Setup Mixer... - + &Edit &Modifica - + Sort Channel Users by &Name Ordina canali per &Nome - + Sort Channel Users by &Instrument Ordina canali per &Strumento - + Sort Channel Users by &Group Ordina Canali per Nome &Utente @@ -945,38 +945,38 @@ Nullo - + Center Centro - + R R - + Central Server Server Centrale - - + + Select Channel Setup File Selezione File di Setup dei Canali - + user utente - + users utenti - + D&isconnect D&isconnetti @@ -1053,6 +1053,11 @@ Right Right (Destra) + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts index b42ccdcb..971a5bb8 100644 --- a/src/res/translation/translation_nl_NL.ts +++ b/src/res/translation/translation_nl_NL.ts @@ -631,7 +631,7 @@ - + L L @@ -854,77 +854,77 @@ - + C&onnect C&onnect - + &File - + &View &Bekijken - + &Connection Setup... &Verbindingsinstellingen... - + My &Profile... Mijn &Profiel... - + C&hat... C&hat... - + &Settings... &Settings... - + &Analyzer Console... &Analyzer Console... - + E&xit E&xit - + &Load Mixer Channels Setup... - + &Save Mixer Channels Setup... - + &Edit &Bewerken - + Sort Channel Users by &Name Sorteer muzikanten op &Naam - + Sort Channel Users by &Instrument Sorteer muzikanten op &Instrument - + Sort Channel Users by &Group Sorteer muzikanten op &Groep @@ -933,38 +933,38 @@ Geen - + Center Centrum - + R R - + Central Server Centrale Server - - + + Select Channel Setup File - + user gebruiker - + users gebruikers - + D&isconnect &Afmelden @@ -1041,6 +1041,11 @@ Right Rechts + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts index a43484e1..5260ac5a 100644 --- a/src/res/translation/translation_pl_PL.ts +++ b/src/res/translation/translation_pl_PL.ts @@ -536,7 +536,7 @@ - + L L @@ -707,77 +707,77 @@ - + C&onnect &Połącz - + &File - + &View &Widok - + &Connection Setup... &Konfiguracja połączenia... - + My &Profile... Mój &profil... - + C&hat... &Czat... - + &Settings... &Ustawienia... - + &Analyzer Console... &Konsola analizatora... - + E&xit &Wyjdź - + &Load Mixer Channels Setup... - + &Save Mixer Channels Setup... - + &Edit &Edytuj - + Sort Channel Users by &Name - + Sort Channel Users by &Instrument - + Sort Channel Users by &Group @@ -786,38 +786,38 @@ Żaden - + Center Środek - + R P - + Central Server - - + + Select Channel Setup File - + user - + users - + D&isconnect &Rozłącz @@ -896,6 +896,11 @@ nie jestem pewna Right Prawy + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_pt_BR.ts b/src/res/translation/translation_pt_BR.ts index d59d5439..79576140 100644 --- a/src/res/translation/translation_pt_BR.ts +++ b/src/res/translation/translation_pt_BR.ts @@ -804,52 +804,52 @@ - + C&onnect C&onectar - + &File &Arquivo - + &View &Ver - + &Connection Setup... &Conectar a Servidor... - + My &Profile... Meu &Perfil... - + C&hat... &Mensagens... - + &Settings... &Definições... - + &Analyzer Console... Console de &Análise... - + E&xit &Sair - + &Edit &Editar @@ -862,18 +862,18 @@ Nenhum - + Center Centro - + R R - + L L @@ -948,53 +948,53 @@ O CPU do cliente ou servidor está em 100%. - + &Load Mixer Channels Setup... &Carregar Configuração de Canais do Mixer... - + &Save Mixer Channels Setup... &Salvar Configuração de Canais do Mixer... - + Sort Channel Users by &Name Ordenar os Canais por &Nome - + Sort Channel Users by &Instrument Ordenar os Canais por &Instrumento - + Sort Channel Users by &Group Ordenar os Canais por &Grupo - + Central Server Servidor Central - - + + Select Channel Setup File Selecione Arquivo de Configuraçao de Canal - + user usuário - + users usuários - + D&isconnect Opted by Desligar instead of Desconectar to keep same keyboard shortcut Desl&igar @@ -1072,6 +1072,11 @@ Right Direito + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts index e9c8b5df..35c1db00 100644 --- a/src/res/translation/translation_pt_PT.ts +++ b/src/res/translation/translation_pt_PT.ts @@ -802,52 +802,52 @@ - + C&onnect &Ligar - + &File &Ficheiro - + &View &Ver - + &Connection Setup... &Ligar a Servidor... - + My &Profile... Meu &Perfil... - + C&hat... &Mensagens... - + &Settings... &Definições... - + &Analyzer Console... Consola de &Análise... - + E&xit &Sair - + &Edit &Editar @@ -860,18 +860,18 @@ Nenhum - + Center Centro - + R R - + L L @@ -946,53 +946,53 @@ O CPU do cliente ou servidor está a 100%. - + &Load Mixer Channels Setup... A&brir configuração da mistura... - + &Save Mixer Channels Setup... Salvar &configuração da mistura... - + Sort Channel Users by &Name Ordenar Utilizadores por &Nome - + Sort Channel Users by &Instrument Ordenar canais por &Instrumento - + Sort Channel Users by &Group Ordenar canais por &Grupo - + Central Server Servidor Central - - + + Select Channel Setup File Selecione o ficheiro de configuração da mistura - + user utilizador - + users utilizadores - + D&isconnect Desl&igar @@ -1069,6 +1069,11 @@ Right Direito + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg diff --git a/src/res/translation/translation_sv_SE.ts b/src/res/translation/translation_sv_SE.ts index 585d1a58..6e1f6220 100644 --- a/src/res/translation/translation_sv_SE.ts +++ b/src/res/translation/translation_sv_SE.ts @@ -566,7 +566,7 @@ - + L V @@ -707,77 +707,77 @@ - + C&onnect &Anslut - + &File &Fil - + &View &Vy - + &Connection Setup... Anslutnings&inställningar... - + My &Profile... Min &profil... - + C&hat... &Chatt... - + &Settings... &Inställningar... - + &Analyzer Console... &Analyskonsol... - + E&xit &Avsluta - + &Load Mixer Channels Setup... &Ladda in mixerkanalinställningarna... - + &Save Mixer Channels Setup... &Spara mixerkanalinställningarna... - + &Edit &Redigera - + Sort Channel Users by &Name Sortera kanalanvändare efter &Namn - + Sort Channel Users by &Instrument Sortera kanalanvändare efter &Instrument - + Sort Channel Users by &Group Sortera kanalanvändare efter &Grupp @@ -786,38 +786,38 @@ Ingen - + Center Mitten - + R H - + Central Server Central server - - + + Select Channel Setup File Välj kanalinställningsfil - + user användare - + users användare - + D&isconnect Koppla &ner @@ -894,6 +894,11 @@ Right Höger + + + MUTED (You are not sending any audio to the server) + + CClientSettingsDlg