From 10aea73304ad82597cbf9707ca0aad92ace6debe Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sun, 1 Mar 2009 22:38:42 +0000
Subject: [PATCH] only one LED for network jitter buffer; removed unnecessary
 help text; update date on about dialog

---
 src/aboutdlgbase.ui          |  2 +-
 src/clientsettingsdlg.cpp    | 21 ++----------
 src/clientsettingsdlgbase.ui | 66 ++++++++++++------------------------
 3 files changed, 25 insertions(+), 64 deletions(-)

diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui
index 0813c8ef..f1d28f5b 100755
--- a/src/aboutdlgbase.ui
+++ b/src/aboutdlgbase.ui
@@ -114,7 +114,7 @@
        <item>
         <widget class="QLabel" name="TextLabelCopyright" >
          <property name="text" >
-          <string>Copyright (C) 2005 - 2008</string>
+          <string>Copyright (C) 2005 - 2009</string>
          </property>
          <property name="wordWrap" >
           <bool>false</bool>
diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index a2a0bd22..ed1fddb1 100755
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -43,18 +43,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
     TextNetBuf->setWhatsThis ( strJitterBufferSize );
     GroupBoxJitterBuffer->setWhatsThis ( strJitterBufferSize );
 
-    QString strNetwBlockSize = tr ( "<b>Network Block Size:</b> The size of "
-        "the network audio blocks for input and output (upstream and "
-        "downstream). The lower these values are set, the lower is the "
-        "overall audio delay but the greater is the network protocoll "
-        "overhead (UDP protocol overhead) which means more bandwidth is "
-        "required. If the upstream/downstream bandwidth is not sufficient "
-        "for the audio stream bandwidth, audio dropouts occur and the "
-        "ping time will increase significantly (the connection is stodged)." );
-    SliderNetBufSiFactIn->setWhatsThis ( strNetwBlockSize );
-    TextNetBufSiFactIn->setWhatsThis ( strNetwBlockSize );
-    GroupBoxNetwBuf->setWhatsThis ( strNetwBlockSize );
-
     // init delay information controls
     CLEDOverallDelay->SetUpdateTime ( 2 * PING_UPDATE_TIME );
     CLEDOverallDelay->Reset();
@@ -336,11 +324,9 @@ void CClientSettingsDlg::SetStatus ( const int iMessType, const int iStatus )
 */
 
     case MS_JIT_BUF_PUT:
-        CLEDNetwPut->SetLight ( iStatus );
-        break;
-
     case MS_JIT_BUF_GET:
-        CLEDNetwGet->SetLight ( iStatus );
+        // network LED shows combined status of put and get
+        CLEDNetw->SetLight ( iStatus );
         break;
 
     case MS_RESET_ALL:
@@ -348,8 +334,7 @@ void CClientSettingsDlg::SetStatus ( const int iMessType, const int iStatus )
         CLEDSoundIn->Reset();
         CLEDSoundOut->Reset();
 */
-        CLEDNetwPut->Reset();
-        CLEDNetwGet->Reset();
+        CLEDNetw->Reset();
         break;
     }
 }
diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui
index ebd3c595..c5ed368b 100755
--- a/src/clientsettingsdlgbase.ui
+++ b/src/clientsettingsdlgbase.ui
@@ -109,38 +109,23 @@
         </item>
        </layout>
       </item>
-      <item>
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="text" >
-         <string>Put / Get:</string>
-        </property>
-        <property name="alignment" >
-         <set>Qt::AlignCenter</set>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
       <item>
        <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
         <item>
-         <widget class="CMultiColorLED" native="1" name="CLEDNetwPut" >
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>16</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="CMultiColorLED" native="1" name="CLEDNetw" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
             <horstretch>0</horstretch>
@@ -162,26 +147,17 @@
          </widget>
         </item>
         <item>
-         <widget class="CMultiColorLED" native="1" name="CLEDNetwGet" >
-          <property name="sizePolicy" >
-           <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
           </property>
-          <property name="minimumSize" >
+          <property name="sizeHint" >
            <size>
-            <width>13</width>
-            <height>13</height>
+            <width>16</width>
+            <height>20</height>
            </size>
           </property>
-          <property name="maximumSize" >
-           <size>
-            <width>13</width>
-            <height>13</height>
-           </size>
-          </property>
-         </widget>
+         </spacer>
         </item>
        </layout>
       </item>