From 598017e47f377683f83e7aefcc83437463e4e616 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 25 Feb 2014 15:38:11 +0000 Subject: [PATCH] Remove the connection LED because it is not actually required. If the connection is successful, the mixer fader appears and shows the connection. If the connection fails, no fader is visible or the fader disappears after a while. In both cases it is clearly seen that the connection is lost and therefore the connection LED is not required. --- src/clientdlg.cpp | 40 ++------------------------ src/clientdlgbase.ui | 67 -------------------------------------------- 2 files changed, 3 insertions(+), 104 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index f3b9b147..b190e768 100755 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -164,20 +164,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP, rbtReverbSelR->setWhatsThis ( strRevChanSel ); rbtReverbSelR->setAccessibleName ( tr ( "Right channel selection for reverberation" ) ); - // connection LED - QString strLEDConnection = tr ( "Connection Status LED: " - "The connection status LED indicator shows the current connection " - "status. If the light is green, a successful connection to the " - "server is established. If the light blinks red right after " - "pressing the connect button, the server address is invalid. " - "If the light turns red and stays red, the connection to the " - "server is lost." ); - - lblConnection->setWhatsThis ( strLEDConnection ); - ledConnection->setWhatsThis ( strLEDConnection ); - - ledConnection->setAccessibleName ( tr ( "Connection status LED indicator" ) ); - // delay LED QString strLEDDelay = tr ( "Delay Status LED: " "The delay status LED indicator shows the current audio delay " @@ -242,7 +228,6 @@ CClientDlg::CClientDlg ( CClient* pNCliP, lbrInputLevelR->setValue ( 0 ); // init status LEDs - ledConnection->Reset(); ledBuffers->Reset(); ledDelay->Reset(); @@ -673,8 +658,10 @@ void CClientDlg::OnConnectDisconBut() void CClientDlg::OnDisconnected() { - // channel is now disconnected, clear mixer board (remove all faders) + // channel is now disconnected, clear mixer board (remove all faders) and + // reset the delay LED (since this is only updated on an active connection) MainMixerBoard->HideAll(); + ledDelay->Reset(); UpdateDisplay(); } @@ -1003,11 +990,6 @@ void CClientDlg::Connect ( const QString& strSelectedAddress, TimerBuffersLED.start ( BUFFER_LED_UPDATE_TIME_MS ); TimerPing.start ( PING_UPDATE_TIME_MS ); } - else - { - // show the error as red light - ledConnection->SetLight ( CMultiColorLED::RL_RED ); - } } void CClientDlg::Disconnect() @@ -1043,7 +1025,6 @@ OnTimerStatus(); // reset LEDs - ledConnection->Reset(); ledBuffers->Reset(); ledDelay->Reset(); ClientSettingsDlg.ResetStatusAndPingLED(); @@ -1054,21 +1035,6 @@ OnTimerStatus(); void CClientDlg::UpdateDisplay() { - // update status LEDs - if ( pClient->IsRunning() ) - { - if ( pClient->IsConnected() ) - { - // connection LED - ledConnection->SetLight ( CMultiColorLED::RL_GREEN ); - } - else - { - // connection LED - ledConnection->SetLight ( CMultiColorLED::RL_RED ); - } - } - // update settings/chat buttons (do not fire signals since it is an update) if ( chbSettings->isChecked() && !ClientSettingsDlg.isVisible() ) { diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index c2a97c6e..86100be6 100755 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -112,58 +112,6 @@ - - - - - - Connection - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - 0 - 0 - - - - - 14 - 14 - - - - - 14 - 14 - - - - - - - - - - Qt::Vertical - - - - 10 - 0 - - - - @@ -511,12 +459,6 @@ - - 6 - - - 0 - @@ -576,9 +518,6 @@ 3 - - 0 - @@ -591,12 +530,6 @@ - - 6 - - - 0 -