changed GUI design (removed status bar and introduced status LEDs), added "Fancy GUI Design" switch in settings dialog

src/audiomixerboard.cpp

@@ -55,6 +55,7 @@ CChannelFader::CChannelFader ( QWidget*     pNW,
         "         border-radius:    4px;"
         "         padding:          4px;"
         "         background-color: white;"
+        "         color:            black;"
         "         font:             bold; }" );
 
     // add user controls to grid
@@ -151,6 +152,13 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
         pFader->setStyleSheet  ( "" );
         pcbMute->setStyleSheet ( "" );
         pcbSolo->setStyleSheet ( "" );
+
+/*
+// TEST
+        pFader->setStyleSheet (
+            "QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );
+*/
+
         pcbMute->setText       ( "Mute" );
         pcbSolo->setText       ( "Solo" );
         break;
@@ -331,6 +339,7 @@ void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign )
     switch ( eNewDesign )
     {
     case GD_ORIGINAL:
+/*
         // group box
         setStyleSheet (
             "QGroupBox { border-image:  url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
@@ -345,6 +354,7 @@ void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign )
             "                   background-color: transparent;"
             "                   color:            rgb(148, 148, 148); }" );
         layout()->setMargin ( 3 );
+*/
         break;
 
     default:

src/client.cpp

@@ -36,7 +36,7 @@ CClient::CClient ( const quint16 iPortNumber ) :
     vstrIPAddress ( MAX_NUM_SERVER_ADDR_ITEMS, "" ),
     strName ( "" ),
     bOpenChatOnNewMessage ( true ),
-    eGUIDesign ( GD_STANDARD ),
+    eGUIDesign ( GD_ORIGINAL ),
     bDoAutoSockBufSize ( true ),
 #if defined ( __APPLE__ ) || defined ( __MACOSX )
 	// we assume on Mac always the preferred frame size works fine

src/clientsettingsdlg.cpp

@@ -279,12 +279,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
         cbGUIDesignFancy->setCheckState ( Qt::Checked );
     }
 
-
-// TODO we disable the fancy GUI switch because the new design
-// is not yet finished
-cbGUIDesignFancy->setVisible ( false );
-
-
     // "High Quality Audio" check box
     if ( pClient->GetCELTHighQuality() )
     {

src/global.h

@@ -113,10 +113,9 @@
 #define MAX_NUM_SERVER_ADDR_ITEMS       6
 
 // defines for LED input level meter
-#define NUM_STEPS_INP_LEV_METER         10
+#define NUM_STEPS_INP_LEV_METER         8
-#define YELLOW_BOUND_INP_LEV_METER      7
+#define RED_BOUND_INP_LEV_METER         7
-#define RED_BOUND_INP_LEV_METER         9
+#define YELLOW_BOUND_INP_LEV_METER      5
-
 
 // maximum number of internet connections (channels)
 // if you want to change this paramter, there has to be done code modifications
@@ -129,7 +128,6 @@
 // without any other changes in the code
 #define USED_NUM_CHANNELS               6 // used number channels for server
 
-
 // length of the moving average buffer for response time measurement
 #define TIME_MOV_AV_RESPONSE            30 // seconds
 

src/llconclientdlg.cpp

@@ -34,7 +34,6 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
     pClient ( pNCliP ),
     QDialog ( parent, f ),
     bUnreadChatMessage ( false ),
-    iErrorStatusCounter ( 0 ),
     ClientSettingsDlg ( pNCliP, parent
 #ifdef _WIN32
                         // this somehow only works reliable on Windows
@@ -74,10 +73,6 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
     QString strInpLevHAccText  = tr ( "Input level meter" );
     QString strInpLevHAccDescr = tr ( "Simulates an analog LED level meter." );
 
-    TextLabelInputLevelL->setWhatsThis                    ( strInpLevH );
-    TextLabelInputLevelL->setToolTip                      ( strInpLevHTT );
-    TextLabelInputLevelR->setWhatsThis                    ( strInpLevH );
-    TextLabelInputLevelR->setToolTip                      ( strInpLevHTT );
     MultiColorLEDBarInputLevelL->setWhatsThis             ( strInpLevH );
     MultiColorLEDBarInputLevelL->setAccessibleName        ( strInpLevHAccText );
     MultiColorLEDBarInputLevelL->setAccessibleDescription ( strInpLevHAccDescr );
@@ -102,11 +97,11 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
         "and disconnecting the llcon software." ) );
 
     // status bar
-    TextLabelStatus->setWhatsThis ( tr ( "<b>Status Bar:</b> In the status bar "
+//    TextLabelStatus->setWhatsThis ( tr ( "<b>Status Bar:</b> In the status bar "
-        "different messages are displayed. E.g., if an error occurred or the "
+//        "different messages are displayed. E.g., if an error occurred or the "
-        "status of the connection is shown." ) );
+//        "status of the connection is shown." ) );
 
-    TextLabelStatus->setAccessibleName ( tr ( "Status bar" ) );
+//    TextLabelStatus->setAccessibleName ( tr ( "Status bar" ) );
 
     // server address
     QString strServAddrH = tr ( "<b>Server Address:</b> The IP address or URL "
@@ -185,9 +180,9 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
     RadioButtonRevSelR->setWhatsThis ( strRevChanSel );
     RadioButtonRevSelR->setAccessibleName ( tr ( "Right channel selection for reverberation" ) );
 
-    // overall status
+    // buffers LED
-    LEDOverallStatus->setWhatsThis ( tr ( "<b>Overall Status:</b> "
+    LEDBuffers->setWhatsThis ( tr ( "<b>Buffers Status LED:</b> "
-        "The light next to the status bar shows the current audio/streaming "
+        "The buffers status LED indicator shows the current audio/streaming "
         "status. If the light is green, there are no buffer overruns/underruns "
         "and the audio stream is not interrupted. If the light is red, the "
         "audio stream is interrupted caused by one of the following problems:"
@@ -201,7 +196,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
         "<li>The CPU of the client or server is at 100%.</li>"
         "</ul>" ) );
 
-    LEDOverallStatus->setAccessibleName ( tr ( "Overall status LED indicator" ) );
+    LEDBuffers->setAccessibleName ( tr ( "Buffers status LED indicator" ) );
 
 
     // init GUI design
@@ -239,6 +234,12 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
     MultiColorLEDBarInputLevelL->setValue ( 0 );
     MultiColorLEDBarInputLevelR->setValue ( 0 );
 
+    // init status LEDs
+    LEDConnection->SetUpdateTime ( 2 * LED_BAR_UPDATE_TIME );
+    LEDChat->SetUpdateTime ( 2 * LED_BAR_UPDATE_TIME );
+    LEDDelay->SetUpdateTime ( 2 * PING_UPDATE_TIME );
+    LEDDelay->Reset();
+
 
     // init slider controls ---
     // audio in fader
@@ -272,7 +273,10 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
     {
         MultiColorLEDBarInputLevelL->setEnabled ( false );
         MultiColorLEDBarInputLevelR->setEnabled ( false );
-        LEDOverallStatus->setEnabled ( false );
+        LEDConnection->setEnabled ( false );
+        LEDBuffers->setEnabled ( false );
+        LEDDelay->setEnabled ( false );
+        LEDChat->setEnabled ( false );
         PushButtonConnect->setFocus();
     }
 
@@ -389,11 +393,8 @@ CLlconClientDlg::CLlconClientDlg ( CClient*        pNCliP,
 
 
     // Timers ------------------------------------------------------------------
-    // set error status timer to a single shot timer
-    TimerErrorStatus.setSingleShot ( true );
-
     // start timer for status bar
-    TimerStatus.start ( STATUSBAR_UPDATE_TIME );
+    TimerStatus.start ( LED_BAR_UPDATE_TIME );
 }
 
 void CLlconClientDlg::closeEvent ( QCloseEvent* Event )
@@ -553,6 +554,8 @@ void CLlconClientDlg::OnDisconnected()
 {
     // channel is now disconnected, clear mixer board (remove all faders)
     MainMixerBoard->HideAll();
+
+    UpdateDisplay();
 }
 
 void CLlconClientDlg::OnConClientListMesReceived ( CVector<CChannelShortInfo> vecChanInfo )
@@ -672,33 +675,16 @@ void CLlconClientDlg::OnPingTimeResult ( int iPingTime )
     if ( iOverallDelayMs <= 40 )
     {
         iOverallDelayLEDColor = MUL_COL_LED_GREEN;
-
-        // reset ping error counter
-        iErrorStatusCounter = 0;
     }
     else
     {
         if ( iOverallDelayMs <= 65 )
         {
             iOverallDelayLEDColor = MUL_COL_LED_YELLOW;
-
-            // reset ping error counter
-            iErrorStatusCounter = 0;
         }
         else
         {
             iOverallDelayLEDColor = MUL_COL_LED_RED;
-
-            iErrorStatusCounter++;
-            if ( iErrorStatusCounter >= NUM_HIGH_PINGS_UNTIL_ERROR )
-            {
-                // delay too long, show error status in main window
-                TimerErrorStatus.start ( ERROR_STATUS_DISPLAY_TIME );
-
-                // avoid integer overrun of error state but keep
-                // error state valid
-                iErrorStatusCounter = NUM_HIGH_PINGS_UNTIL_ERROR;
-            }
         }
     }
 
@@ -711,6 +697,9 @@ void CLlconClientDlg::OnPingTimeResult ( int iPingTime )
                                               iOverallDelayMs,
                                               iOverallDelayLEDColor );
     }
+
+    // update delay LED on the main window
+    LEDDelay->SetLight ( iOverallDelayLEDColor );
 }
 
 void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart )
@@ -742,10 +731,6 @@ void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart )
             {
                 PushButtonConnect->setText ( CON_BUT_DISCONNECTTEXT );
 
-                // reset ping error counter and timer
-                iErrorStatusCounter = 0;
-                TimerErrorStatus.stop();
-
                 // start timer for level meter bar and ping time measurement
                 TimerSigMet.start ( LEVELMETER_UPDATE_TIME );
                 TimerPing.start ( PING_UPDATE_TIME );
@@ -753,12 +738,8 @@ void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart )
         }
         else
         {
-            // Restart timer to ensure that the text is visible at
+            // show the error as red light
-            // least the time for one complete interval
+            LEDConnection->SetLight ( MUL_COL_LED_RED );
-            TimerStatus.start ( STATUSBAR_UPDATE_TIME );
-
-            // show the error in the status bar
-            TextLabelStatus->setText ( tr ( "Invalid address" ) );
         }
     }
     else
@@ -782,8 +763,18 @@ void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart )
         // stop ping time measurement timer
         TimerPing.stop();
 
-        // immediately update status bar
+
-        OnTimerStatus();
+// TODO is this still required???
+// immediately update status bar
+OnTimerStatus();
+
+// TODO this seems not to work, LEDs are still updated afterwards...
+// reset LEDs
+LEDConnection->Reset();
+LEDBuffers->Reset();
+LEDDelay->Reset();
+LEDChat->Reset();
+
 
         // clear mixer board (remove all faders)
         MainMixerBoard->HideAll();
@@ -792,36 +783,30 @@ void CLlconClientDlg::ConnectDisconnect ( const bool bDoStart )
 
 void CLlconClientDlg::UpdateDisplay()
 {
-    // show connection status in status bar
+    // update status LEDs
-    if ( pClient->IsConnected() && pClient->IsRunning() )
+    if ( pClient->IsRunning() )
     {
-        QString strStatus;
+        if ( pClient->IsConnected() )
-        if ( TimerErrorStatus.isActive() )
         {
-            // right now we only have one error case: delay too high
+            // chat LED
-            strStatus = tr ( "<font color=""red""><b>Audio delay too large</b></font>" );
+            if ( bUnreadChatMessage )
+            {
+                LEDChat->SetLight ( MUL_COL_LED_GREEN );
+            }
+            else
+            {
+                LEDChat->Reset();
+            }
+
+            // connection LED
+            LEDConnection->SetLight ( MUL_COL_LED_GREEN );
         }
         else
         {
-            strStatus = tr ( "Connected" );
+            // connection LED
+            LEDConnection->SetLight ( MUL_COL_LED_RED );
         }
-
-        if ( bUnreadChatMessage )
-        {
-            strStatus += ", <b>New chat</b>";
-        }
-
-        TextLabelStatus->setText ( strStatus );
     }
-    else
-    {
-        TextLabelStatus->setText ( tr ( "Disconnected" ) );
-    }
-
-// TEST
-//TextLabelStatus->setText ( QString( "Time: %1, Netw: %2" ).arg ( pClient->GetTimingStdDev() ).arg ( pClient->GetChannel()->GetTimingStdDev() ) );
-//TextLabelStatus->setText ( QString( "Buf. Err. Rate: %1 %" ).arg ( pClient->GetChannel()->GetJitterBufferErrorRate() * 100.0 ) );
-
 }
 
 void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
@@ -830,6 +815,21 @@ void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
     switch ( eNewDesign )
     {
     case GD_ORIGINAL:
+        backgroundFrame->setStyleSheet (
+            "QFrame#backgroundFrame { border-image:  url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
+            "                         border-top:    34px transparent;"
+            "                         border-bottom: 40px transparent;"
+            "                         border-left:   30px transparent;"
+            "                         border-right:  40px transparent;"
+            "                         padding:       -5px;"
+            "                         margin:        -5px, -5px, 0px, 0px; }"
+            "QLabel { color: rgb(148, 148, 148);"
+            "         font:  bold; }"
+            "QRadioButton { color: rgb(148, 148, 148);"
+            "               font:  bold; }"
+            "QGroupBox::title { color: rgb(148, 148, 148); }" );
+
+/*
         // group box
         groupBoxLocal->setStyleSheet (
             "QGroupBox { border-image:  url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
@@ -844,7 +844,8 @@ void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
             "                   background-color: transparent;"
             "                   color:            rgb(148, 148, 148); }" );
         groupBoxLocal->layout()->setMargin ( 3 );
-
+*/
+/*
         // audio fader
         SliderAudInFader->setStyleSheet (
             "QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
@@ -875,19 +876,45 @@ void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
         TextLabelAudReverb->setStyleSheet (
             "QLabel { color: rgb(148, 148, 148);"
             "         font:  bold; }" );
+*/
          break;
 
     default:
         // reset style sheet and set original paramters
-        groupBoxLocal->setStyleSheet       ( "" );
+
-        groupBoxLocal->layout()->setMargin ( 9 );
+/*
-        SliderAudInFader->setStyleSheet    ( "" );
+backgroundFrame->setStyleSheet ( "QFrame#backgroundFrame { border-image: url(:/png/fader/res/mixerboardbackground.png) 34px 30px 40px 40px;"
-        SliderAudReverb->setStyleSheet     ( "" );
+                      "  border-top:    34px transparent;"
-        RadioButtonRevSelL->setStyleSheet  ( "" );
+                      "  border-bottom: 40px transparent;"
-        RadioButtonRevSelR->setStyleSheet  ( "" );
+                      "  border-left:   30px transparent;"
-        TextLabelAudReverb->setStyleSheet  ( "" );
+                      "  border-right:  40px transparent;"
-        TextLabelAudFader->setStyleSheet   ( "" );
+                      "  padding:       -5px;"
-        TextAudInFader->setStyleSheet      ( "" );
+                      "  margin:        -5px, -5px, 0px, 0px; }"
+                      "QLabel { color: rgb(148, 148, 148);"
+                      "     font:  bold; }"
+                      "QRadioButton {color: rgb(148, 148, 148);"
+                      "     font:  bold; }");
+*/
+//        groupBoxLocal->setStyleSheet       ( "" );
+//        groupBoxLocal->layout()->setMargin ( 9 );
+
+
+        backgroundFrame->setStyleSheet    ( "" );
+        SliderAudInFader->setStyleSheet   ( "" );
+        SliderAudReverb->setStyleSheet    ( "" );
+        RadioButtonRevSelL->setStyleSheet ( "" );
+        RadioButtonRevSelR->setStyleSheet ( "" );
+        TextLabelAudReverb->setStyleSheet ( "" );
+        TextLabelAudFader->setStyleSheet  ( "" );
+        TextAudInFader->setStyleSheet     ( "" );
+
+/*
+SliderAudInFader->setStyleSheet (
+    "QSlider { background-image: url(:/png/fader/res/faderbackground.png);"
+    "          width:            45px; }"
+    "QSlider::groove { image: url(); }"
+    "QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
+*/
         break;
     }
 
@@ -908,12 +935,15 @@ void CLlconClientDlg::customEvent ( QEvent* Event )
         case MS_SOUND_OUT:
         case MS_JIT_BUF_PUT:
         case MS_JIT_BUF_GET:
-            // show overall status -> if any LED goes red, this LED will go red
+            // buffer status -> if any buffer goes red, this LED will go red
-            LEDOverallStatus->SetLight ( iStatus );
+            LEDBuffers->SetLight ( iStatus );
             break;
 
         case MS_RESET_ALL:
-            LEDOverallStatus->Reset();
+            LEDConnection->Reset();
+            LEDBuffers->Reset();
+            LEDDelay->Reset();
+            LEDChat->Reset();
             break;
 
         case MS_SET_JIT_BUF_SIZE:

src/llconclientdlg.h

@@ -56,9 +56,8 @@
 #define CON_BUT_DISCONNECTTEXT      "D&isconnect"
 
 // update time for GUI controls
-#define LEVELMETER_UPDATE_TIME      100  // ms
+#define LEVELMETER_UPDATE_TIME      100   // ms
-#define STATUSBAR_UPDATE_TIME       1000 // ms
+#define LED_BAR_UPDATE_TIME         1000  // ms
-#define ERROR_STATUS_DISPLAY_TIME   3000 // ms
 
 // range for signal level meter
 #define LOW_BOUND_SIG_METER         ( -50.0 ) // dB
@@ -89,11 +88,9 @@ protected:
     CClient*           pClient;
     bool               bConnected;
     bool               bUnreadChatMessage;
-    int                iErrorStatusCounter;
     QTimer             TimerSigMet;
     QTimer             TimerStatus;
     QTimer             TimerPing;
-    QTimer             TimerErrorStatus;
 
     virtual void       customEvent ( QEvent* Event );
     virtual void       closeEvent  ( QCloseEvent* Event );

src/multicolorledbar.cpp

@@ -36,21 +36,21 @@ CMultiColorLEDBar::CMultiColorLEDBar ( QWidget* parent, Qt::WindowFlags f )
     iNumLEDs = NUM_STEPS_INP_LEV_METER;
 
     // create layout and set spacing to zero
-    pMainLayout = new QHBoxLayout ( this );
+    pMainLayout = new QVBoxLayout ( this );
-    pMainLayout->setAlignment ( Qt::AlignVCenter );
+    pMainLayout->setAlignment ( Qt::AlignHCenter );
     pMainLayout->setMargin    ( 0 );
     pMainLayout->setSpacing   ( 0 );
 
     // create LEDs
     vecpLEDs.Init ( iNumLEDs );
-    for ( int iLEDIdx = 0; iLEDIdx < iNumLEDs; iLEDIdx++ )
+    for ( int iLEDIdx = iNumLEDs - 1; iLEDIdx >= 0; iLEDIdx-- )
     {
         // create LED object
         vecpLEDs[iLEDIdx] = new cLED ( parent );
 
-        // add LED to layout with spacer (do not add spacer on the left of the
+        // add LED to layout with spacer (do not add spacer on the bottom of the
         // first LED)
-        if ( iLEDIdx > 0 )
+        if ( iLEDIdx < iNumLEDs - 1 )
         {
             pMainLayout->addStretch();
         }
@@ -135,10 +135,10 @@ void CMultiColorLEDBar::setValue ( const int value )
 
 CMultiColorLEDBar::cLED::cLED ( QWidget* parent ) :
     BitmCubeRoundDisabled ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDDisabledSmall.png" ) ),
-    BitmCubeRoundGrey     ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDGreySmall.png" ) ),
+    BitmCubeRoundGrey     ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDGreySmall.png" ) ),
-    BitmCubeRoundGreen    ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDGreenSmall.png" ) ),
+    BitmCubeRoundGreen    ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDGreenSmall.png" ) ),
-    BitmCubeRoundYellow   ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDYellowSmall.png" ) ),
+    BitmCubeRoundYellow   ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDYellowSmall.png" ) ),
-    BitmCubeRoundRed      ( QString::fromUtf8 ( ":/png/LEDs/res/VLEDRedSmall.png" ) )
+    BitmCubeRoundRed      ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDRedSmall.png" ) )
 {
     // create LED label
     pLEDLabel = new QLabel ( "", parent );

src/multicolorledbar.h

@@ -75,7 +75,7 @@ protected:
     void Reset ( const bool bEnabled );
     virtual void changeEvent ( QEvent* curEvent );
 
-    QHBoxLayout*     pMainLayout;
+    QVBoxLayout*     pMainLayout;
 
     int              iNumLEDs;
     CVector<cLED*>   vecpLEDs;

src/resources.qrc

@@ -11,6 +11,10 @@
         <file>res/CLEDRedSmall.png</file>
         <file>res/CLEDYellow.png</file>
         <file>res/CLEDYellowSmall.png</file>
+        <file>res/HLEDGreenSmall.png</file>
+        <file>res/HLEDGreySmall.png</file>
+        <file>res/HLEDRedSmall.png</file>
+        <file>res/HLEDYellowSmall.png</file>
         <file>res/VLEDBlack.png</file>
         <file>res/VLEDBlackSmall.png</file>
         <file>res/VLEDDisabledSmall.png</file>
@@ -43,6 +47,8 @@
     </qresource>
     <qresource prefix="/png/main" >
         <file>res/gig.png</file>
+        <file>res/llconfronticon.png</file>
+        <file>res/logopicture.png</file>
         <file>res/mainicon.png</file>
     </qresource>
 </RCC>