From bf365ce0bce144ccd577ed55ed777926d89438e9 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Wed, 4 Oct 2006 18:05:33 +0000
Subject: [PATCH] GUI improvements

---
 src/global.h              |  4 +-
 src/llconclientdlg.cpp    |  8 ++--
 src/llconclientdlgbase.ui | 87 +++++++++++++++------------------------
 3 files changed, 39 insertions(+), 60 deletions(-)

diff --git a/src/global.h b/src/global.h
index 93a0d613..68c524d4 100755
--- a/src/global.h
+++ b/src/global.h
@@ -42,7 +42,7 @@
 
 /* version and application name (always use this version) */
 #undef VERSION
-#define VERSION							"0.9.6cvs"
+#define VERSION							"0.9.7cvs"
 #define APP_NAME						"llcon"
 
 
@@ -68,7 +68,7 @@
 #define NET_BLOCK_SIZE_FACTOR			3 // 3 * 2 ms = 6 ms
 
 // maximum value of factor for network block size
-#define NET_BLOCK_SIZE_FACTOR_MAX		15
+#define NET_BLOCK_SIZE_FACTOR_MAX		8
 
 /* maximum network buffer size (which can be chosen by slider) */
 #define MAX_NET_BUF_SIZE_NUM_BL			10 /* number of blocks */
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index 8bd75ce6..fae08e30 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -102,7 +102,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
 	SliderNetBufSiFactIn->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX);
 	const int iCurNetBufSiFactIn = pClient->GetNetwBufSizeFactIn();
 	SliderNetBufSiFactIn->setValue(iCurNetBufSiFactIn);
-	TextNetBufSiFactIn->setText("In: " + QString().setNum(
+	TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
 		double(iCurNetBufSiFactIn * MIN_BLOCK_DURATION_MS), 'f', 2) +
 		" ms");
 
@@ -110,7 +110,7 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
 	SliderNetBufSiFactOut->setRange(1, NET_BLOCK_SIZE_FACTOR_MAX);
 	const int iCurNetBufSiFactOut = pClient->GetNetwBufSizeFactOut();
 	SliderNetBufSiFactOut->setValue(iCurNetBufSiFactOut);
-	TextNetBufSiFactOut->setText("Out: " + QString().setNum(
+	TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
 		double(iCurNetBufSiFactOut * MIN_BLOCK_DURATION_MS), 'f', 2) +
 		" ms");
 
@@ -272,7 +272,7 @@ void CLlconClientDlg::OnSliderNetBuf(int value)
 void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
 {
 	pClient->SetNetwBufSizeFactIn ( value );
-	TextNetBufSiFactIn->setText("In: " + QString().setNum(
+	TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
 		double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
 		" ms");
 	UpdateDisplay();
@@ -281,7 +281,7 @@ void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
 void CLlconClientDlg::OnSliderNetBufSiFactOut(int value)
 {
 	pClient->SetNetwBufSizeFactOut ( value );
-	TextNetBufSiFactOut->setText("Out: " + QString().setNum(
+	TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
 		double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
 		" ms");
 	UpdateDisplay();
diff --git a/src/llconclientdlgbase.ui b/src/llconclientdlgbase.ui
index e5bdadfd..bc254076 100755
--- a/src/llconclientdlgbase.ui
+++ b/src/llconclientdlgbase.ui
@@ -11,7 +11,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>927</width>
+            <width>776</width>
             <height>287</height>
         </rect>
     </property>
@@ -452,7 +452,8 @@
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>Audio Fader</string>
+                                        <string>Audio
+Fader</string>
                                     </property>
                                     <property stdset="1">
                                         <name>alignment</name>
@@ -506,7 +507,8 @@
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>Reverb</string>
+                                        <string>Reverb
+Level</string>
                                     </property>
                                     <property stdset="1">
                                         <name>alignment</name>
@@ -547,7 +549,8 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Reverb Selection</string>
+                        <string>Reverb Chan.
+Selection</string>
                     </property>
                     <property stdset="1">
                         <name>alignment</name>
@@ -623,6 +626,13 @@
                         <name>name</name>
                         <cstring>TextNetBuf</cstring>
                     </property>
+                    <property stdset="1">
+                        <name>minimumSize</name>
+                        <size>
+                            <width>50</width>
+                            <height>0</height>
+                        </size>
+                    </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Size</string>
@@ -761,7 +771,7 @@
                     <property stdset="1">
                         <name>minimumSize</name>
                         <size>
-                            <width>85</width>
+                            <width>50</width>
                             <height>0</height>
                         </size>
                     </property>
@@ -802,13 +812,6 @@
                         <name>name</name>
                         <cstring>TextNetBufSiFactOut</cstring>
                     </property>
-                    <property stdset="1">
-                        <name>minimumSize</name>
-                        <size>
-                            <width>0</width>
-                            <height>0</height>
-                        </size>
-                    </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>Size</string>
@@ -1135,16 +1138,9 @@
                 <name>name</name>
                 <cstring>GroupBoxMeasureResults</cstring>
             </property>
-            <property stdset="1">
-                <name>minimumSize</name>
-                <size>
-                    <width>152</width>
-                    <height>0</height>
-                </size>
-            </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Measurement Results</string>
+                <string>Debug</string>
             </property>
             <vbox>
                 <property stdset="1">
@@ -1156,43 +1152,26 @@
                     <number>6</number>
                 </property>
                 <widget>
-                    <class>QLayoutWidget</class>
+                    <class>QLabel</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>Layout17</cstring>
+                        <cstring>TextLabelStdDevTimerLabel</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>StdDev:</string>
+                    </property>
+                </widget>
+                <widget>
+                    <class>QLabel</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>TextLabelStdDevTimer</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>val</string>
                     </property>
-                    <hbox>
-                        <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
-                        </property>
-                        <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
-                        </property>
-                        <widget>
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabelStdDevTimerLabel</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>StdDev:</string>
-                            </property>
-                        </widget>
-                        <widget>
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>TextLabelStdDevTimer</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>val</string>
-                            </property>
-                        </widget>
-                    </hbox>
                 </widget>
             </vbox>
         </widget>