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 @@
-
+
&Verbinden
-
+
&Datei
-
+
&Ansicht
-
+
&Verbinden...
-
+
Mein &Profil...
-
+
C&hat...
-
+
&Einstellungen...
-
+
-
+
&Beenden
-
+
B&earbeiten
@@ -848,18 +848,18 @@
Keine
-
+
Mitte
-
+
-
+
@@ -934,53 +934,53 @@
Die CPU des Computers ist voll ausgelastet.
-
+
&Laden der Konfiguration der Mixerkanäle...
-
+
&Speichern der Konfiguration der Mixerkanäle...
-
+
Sortiere die Kanäle nach dem &Namen
-
+
Sortiere die Kanäle nach dem &Instrument
-
+
Sortiere die Kanäle nach der &Gruppe
-
+
Zentralserver
-
-
+
+
Auswählen der Datei für die Konfiguration der Mixerkanäle
-
+
Musiker
-
+
Musiker
-
+
&Trennen
@@ -1057,6 +1057,11 @@
Rechts
+
+
+
+ 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&onectar
-
+
&Archivo
-
+
&Ver
-
+
&Configuración de Conexión...
-
+
Mi &Perfil...
-
+
C&hat...
-
+
&Configuración...
-
+
&Analyzer Console...
-
+
S&alir
-
+
&Editar
-
+
Ordenar Usuarios de Canal por &Grupo
@@ -869,18 +869,18 @@
Ninguno
-
+
Centro
-
+
R
-
+
L
@@ -955,48 +955,48 @@
El procesador del cliente o del servidor está al 100%.
-
+
&Cargar Configuración Canales Mezclador...
-
+
&Guardar Configuración Canales Mezclador...
-
+
Ordenar Canales por &Nombre
-
+
Ordenar Canales por &Instrumento
-
+
Servidor Central
-
-
+
+
Seleccionar Archivo Configuración Canales
-
+
usuario
-
+
usuarios
-
+
D&esconectar
@@ -1073,6 +1073,11 @@
Dcho
+
+
+
+
+
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 @@
-
+
Se c&onnecter
-
+
&Fichier
-
+
&Vue
-
+
Paramètres de &connexion...
-
+
Mon &profil
-
+
Tc&hate...
-
+
Paramètre&s...
-
+
Console d'&analyse
-
+
&Quitter
-
+
Édit&er
@@ -864,18 +864,18 @@
Aucun
-
+
Centre
-
+
D
-
+
G
@@ -950,53 +950,53 @@
Le processeur du client ou du serveur est à 100%.
-
+
&Charger la configuration des canaux du mixeur...
-
+
&Sauvegarder la configuration des canaux du mixeur...
-
+
Trier les utilisateurs du canal par &nom
-
+
Trier les utilisateurs du canal par &instrument
-
+
Trier les utilisateurs des canaux par &groupe
-
+
Serveur central
-
-
+
+
Sélectionnez le fichier de configuration des canaux
-
+
utilisateur
-
+
utilisateurs
-
+
Dé&connecter
@@ -1073,6 +1073,11 @@
Droite
+
+
+
+
+
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
@@ -862,77 +862,77 @@
-
+
C&onnetti
-
+
&File
-
+
&Vista
-
+
Setup &Connessione...
-
+
&Profilo Personale...
-
+
C&hat...
-
+
&Settaggi...
-
+
&Analizzatore...
-
+
&Uscita
-
+
&Carica Setup Mixer...
-
+
&Salva Setup Mixer...
-
+
&Modifica
-
+
Ordina canali per &Nome
-
+
Ordina canali per &Strumento
-
+
Ordina Canali per Nome &Utente
@@ -945,38 +945,38 @@
Nullo
-
+
Centro
-
+
R
-
+
Server Centrale
-
-
+
+
Selezione File di Setup dei Canali
-
+
utente
-
+
utenti
-
+
D&isconnetti
@@ -1053,6 +1053,11 @@
Right (Destra)
+
+
+
+
+
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
@@ -854,77 +854,77 @@
-
+
C&onnect
-
+
-
+
&Bekijken
-
+
&Verbindingsinstellingen...
-
+
Mijn &Profiel...
-
+
C&hat...
-
+
&Settings...
-
+
&Analyzer Console...
-
+
E&xit
-
+
-
+
-
+
&Bewerken
-
+
Sorteer muzikanten op &Naam
-
+
Sorteer muzikanten op &Instrument
-
+
Sorteer muzikanten op &Groep
@@ -933,38 +933,38 @@
Geen
-
+
Centrum
-
+
R
-
+
Centrale Server
-
-
+
+
-
+
gebruiker
-
+
gebruikers
-
+
&Afmelden
@@ -1041,6 +1041,11 @@
Rechts
+
+
+
+
+
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
@@ -707,77 +707,77 @@
-
+
&Połącz
-
+
-
+
&Widok
-
+
&Konfiguracja połączenia...
-
+
Mój &profil...
-
+
&Czat...
-
+
&Ustawienia...
-
+
&Konsola analizatora...
-
+
&Wyjdź
-
+
-
+
-
+
&Edytuj
-
+
-
+
-
+
@@ -786,38 +786,38 @@
Żaden
-
+
Środek
-
+
P
-
+
-
-
+
+
-
+
-
+
-
+
&Rozłącz
@@ -896,6 +896,11 @@ nie jestem pewna
Prawy
+
+
+
+
+
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&onectar
-
+
&Arquivo
-
+
&Ver
-
+
&Conectar a Servidor...
-
+
Meu &Perfil...
-
+
&Mensagens...
-
+
&Definições...
-
+
Console de &Análise...
-
+
&Sair
-
+
&Editar
@@ -862,18 +862,18 @@
Nenhum
-
+
Centro
-
+
R
-
+
L
@@ -948,53 +948,53 @@
O CPU do cliente ou servidor está em 100%.
-
+
&Carregar Configuração de Canais do Mixer...
-
+
&Salvar Configuração de Canais do Mixer...
-
+
Ordenar os Canais por &Nome
-
+
Ordenar os Canais por &Instrumento
-
+
Ordenar os Canais por &Grupo
-
+
Servidor Central
-
-
+
+
Selecione Arquivo de Configuraçao de Canal
-
+
usuário
-
+
usuários
-
+
Opted by Desligar instead of Desconectar to keep same keyboard shortcut
Desl&igar
@@ -1072,6 +1072,11 @@
Direito
+
+
+
+
+
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 @@
-
+
&Ligar
-
+
&Ficheiro
-
+
&Ver
-
+
&Ligar a Servidor...
-
+
Meu &Perfil...
-
+
&Mensagens...
-
+
&Definições...
-
+
Consola de &Análise...
-
+
&Sair
-
+
&Editar
@@ -860,18 +860,18 @@
Nenhum
-
+
Centro
-
+
R
-
+
L
@@ -946,53 +946,53 @@
O CPU do cliente ou servidor está a 100%.
-
+
A&brir configuração da mistura...
-
+
Salvar &configuração da mistura...
-
+
Ordenar Utilizadores por &Nome
-
+
Ordenar canais por &Instrumento
-
+
Ordenar canais por &Grupo
-
+
Servidor Central
-
-
+
+
Selecione o ficheiro de configuração da mistura
-
+
utilizador
-
+
utilizadores
-
+
Desl&igar
@@ -1069,6 +1069,11 @@
Direito
+
+
+
+
+
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 @@
-
+
V
@@ -707,77 +707,77 @@
-
+
&Anslut
-
+
&Fil
-
+
&Vy
-
+
Anslutnings&inställningar...
-
+
Min &profil...
-
+
&Chatt...
-
+
&Inställningar...
-
+
&Analyskonsol...
-
+
&Avsluta
-
+
&Ladda in mixerkanalinställningarna...
-
+
&Spara mixerkanalinställningarna...
-
+
&Redigera
-
+
Sortera kanalanvändare efter &Namn
-
+
Sortera kanalanvändare efter &Instrument
-
+
Sortera kanalanvändare efter &Grupp
@@ -786,38 +786,38 @@
Ingen
-
+
Mitten
-
+
H
-
+
Central server
-
-
+
+
Välj kanalinställningsfil
-
+
användare
-
+
användare
-
+
Koppla &ner
@@ -894,6 +894,11 @@
Höger
+
+
+
+
+
CClientSettingsDlg