new General Settings Dialog, we moved some controls from main windows to this control to make main window smaller and make room for future enhancements

This commit is contained in:
Volker Fischer 2006-11-03 18:54:12 +00:00
parent 3e71e83110
commit 1cd6cd644d
9 changed files with 1036 additions and 734 deletions

View File

@ -8,7 +8,8 @@ llcon_SOURCES = ../src/buffer.cpp \
../src/resample.cpp \
../src/channel.cpp \
../src/util.cpp \
../src/llconclientdlg.cpp \
../src/llconclientdlg.cpp \
../src/clientsettingsdlg.cpp \
../src/client.cpp \
../src/llconserverdlg.cpp \
../src/server.cpp \
@ -30,7 +31,8 @@ llcon_SOURCES = ../src/buffer.cpp \
../src/protocol.h \
../src/multicolorled.h \
../src/llconserverdlg.h \
../src/llconclientdlg.h \
../src/llconclientdlg.h \
../src/clientsettingsdlg.h \
../src/llconclientdlgbase.ui \
../src/llconserverdlgbase.ui \
../src/aboutdlgbase.ui \
@ -46,6 +48,7 @@ BUILT_SOURCES=moc/moc_server.cpp \
moc/moc_multicolorled.cpp \
moc/moc_util.cpp \
moc/moc_llconclientdlg.cpp moc/moc_llconclientdlgbase.cpp moc/llconclientdlgbase.h moc/llconclientdlgbase.cpp \
moc/moc_clientsettingsdlg.cpp moc/moc_clientsettingsdlgbase.cpp moc/clientsettingsdlgbase.h moc/clientsettingsdlgbase.cpp \
moc/moc_llconserverdlg.cpp moc/moc_llconserverdlgbase.cpp moc/llconserverdlgbase.h moc/llconserverdlgbase.cpp \
moc/moc_aboutdlgbase.cpp moc/aboutdlgbase.h moc/aboutdlgbase.cpp
@ -100,8 +103,21 @@ moc/llconclientdlgbase.h: ../src/llconclientdlgbase.ui
moc/llconclientdlgbase.cpp: ../src/llconclientdlgbase.ui moc/llconclientdlgbase.h
$(UIC) ../src/llconclientdlgbase.ui -i moc/llconclientdlgbase.h -o moc/llconclientdlgbase.cpp
moc/moc_clientsettingsdlg.cpp: ../src/clientsettingsdlg.h
$(MOC) ../src/clientsettingsdlg.h -o moc/moc_clientsettingsdlg.cpp
moc/moc_clientsettingsdlgbase.cpp: moc/clientsettingsdlgbase.h
$(MOC) moc/clientsettingsdlgbase.h -o moc/moc_clientsettingsdlgbase.cpp
moc/clientsettingsdlgbase.h: ../src/clientsettingsdlgbase.ui
$(UIC) ../src/clientsettingsdlgbase.ui -o moc/clientsettingsdlgbase.h
moc/clientsettingsdlgbase.cpp: ../src/clientsettingsdlgbase.ui moc/clientsettingsdlgbase.h
$(UIC) ../src/clientsettingsdlgbase.ui -i moc/clientsettingsdlgbase.h -o moc/clientsettingsdlgbase.cpp
moc/moc_llconserverdlg.cpp: ../src/llconserverdlg.h
$(MOC) ../src/llconserverdlg.h -o moc/moc_llconserverdlg.cpp

170
src/clientsettingsdlg.cpp Executable file
View File

@ -0,0 +1,170 @@
/******************************************************************************\
* Copyright (c) 2004-2006
*
* Author(s):
* Volker Fischer
*
******************************************************************************
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
\******************************************************************************/
#include "clientsettingsdlg.h"
/* Implementation *************************************************************/
CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, QWidget* parent,
const char* name, bool modal, WFlags f) : pClient ( pNCliP ),
CClientSettingsDlgBase ( parent, name, modal, f )
{
/* Init timing jitter text label */
TextLabelStdDevTimer->setText ( "" );
/* init slider controls --- */
/* sound buffer in */
SliderSndBufIn->setRange(2, AUD_SLIDER_LENGTH);
const int iCurNumInBuf = pClient->GetSndInterface()->GetInNumBuf();
SliderSndBufIn->setValue(iCurNumInBuf);
TextSndBufIn->setText("In: " + QString().setNum(iCurNumInBuf));
/* sound buffer out */
SliderSndBufOut->setRange(2, AUD_SLIDER_LENGTH);
const int iCurNumOutBuf = pClient->GetSndInterface()->GetOutNumBuf();
SliderSndBufOut->setValue(iCurNumOutBuf);
TextSndBufOut->setText("Out: " + QString().setNum(iCurNumOutBuf));
/* network buffer */
SliderNetBuf->setRange(0, MAX_NET_BUF_SIZE_NUM_BL);
const int iCurNumNetBuf = pClient->GetSockBufSize();
SliderNetBuf->setValue(iCurNumNetBuf);
TextNetBuf->setText("Size: " + QString().setNum(iCurNumNetBuf));
/* network buffer size factor in */
SliderNetBufSiFactIn->setRange(1, MAX_NET_BLOCK_SIZE_FACTOR);
const int iCurNetBufSiFactIn = pClient->GetNetwBufSizeFactIn();
SliderNetBufSiFactIn->setValue(iCurNetBufSiFactIn);
TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(iCurNetBufSiFactIn * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
/* network buffer size factor out */
SliderNetBufSiFactOut->setRange(1, MAX_NET_BLOCK_SIZE_FACTOR);
const int iCurNetBufSiFactOut = pClient->GetNetwBufSizeFactOut();
SliderNetBufSiFactOut->setValue(iCurNetBufSiFactOut);
TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(iCurNetBufSiFactOut * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
/* connections ---------------------------------------------------------- */
/* timers */
QObject::connect(&TimerStatus, SIGNAL(timeout()),
this, SLOT(OnTimerStatus()));
/* sliders */
QObject::connect(SliderSndBufIn, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderSndBufInChange(int)));
QObject::connect(SliderSndBufOut, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderSndBufOutChange(int)));
QObject::connect(SliderNetBuf, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderNetBuf(int)));
QObject::connect(SliderNetBufSiFactIn, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderNetBufSiFactIn(int)));
QObject::connect(SliderNetBufSiFactOut, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderNetBufSiFactOut(int)));
/* timers --------------------------------------------------------------- */
/* start timer for status bar */
TimerStatus.start(DISPLAY_UPDATE_TIME);
}
void CClientSettingsDlg::OnSliderSndBufInChange(int value)
{
pClient->GetSndInterface()->SetInNumBuf(value);
TextSndBufIn->setText("In: " + QString().setNum(value));
UpdateDisplay();
}
void CClientSettingsDlg::OnSliderSndBufOutChange(int value)
{
pClient->GetSndInterface()->SetOutNumBuf(value);
TextSndBufOut->setText("Out: " + QString().setNum(value));
UpdateDisplay();
}
void CClientSettingsDlg::OnSliderNetBuf(int value)
{
pClient->SetSockBufSize ( value );
TextNetBuf->setText("Size: " + QString().setNum(value));
UpdateDisplay();
}
void CClientSettingsDlg::OnSliderNetBufSiFactIn(int value)
{
pClient->SetNetwBufSizeFactIn ( value );
TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
UpdateDisplay();
}
void CClientSettingsDlg::OnSliderNetBufSiFactOut(int value)
{
pClient->SetNetwBufSizeFactOut ( value );
TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
UpdateDisplay();
}
void CClientSettingsDlg::UpdateDisplay()
{
/* response time */
TextLabelStdDevTimer->setText(QString().
setNum(pClient->GetTimingStdDev(), 'f', 2) + " ms");
}
void CClientSettingsDlg::SetStatus ( const int iMessType, const int iStatus )
{
switch(iMessType)
{
case MS_SOUND_IN:
CLEDSoundIn->SetLight(iStatus);
break;
case MS_SOUND_OUT:
CLEDSoundOut->SetLight(iStatus);
break;
case MS_JIT_BUF_PUT:
CLEDNetwPut->SetLight(iStatus);
break;
case MS_JIT_BUF_GET:
CLEDNetwGet->SetLight(iStatus);
break;
case MS_RESET_ALL:
CLEDSoundIn->Reset();
CLEDSoundOut->Reset();
CLEDNetwPut->Reset();
CLEDNetwGet->Reset();
break;
}
}

74
src/clientsettingsdlg.h Executable file
View File

@ -0,0 +1,74 @@
/******************************************************************************\
* Copyright (c) 2004-2006
*
* Author(s):
* Volker Fischer
*
******************************************************************************
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation; either version 2 of the License, or (at your option) any later
* version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
\******************************************************************************/
#include <qlabel.h>
#include <qstring.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qprogressbar.h>
#include <qwhatsthis.h>
#include <qtimer.h>
#include <qslider.h>
#include <qradiobutton.h>
#include <qmenubar.h>
#include <qlayout.h>
#include "global.h"
#include "client.h"
#include "multicolorled.h"
#ifdef _WIN32
# include "../windows/moc/clientsettingsdlgbase.h"
#else
# include "moc/clientsettingsdlgbase.h"
#endif
/* Definitions ****************************************************************/
/* update time for GUI controls */
#define DISPLAY_UPDATE_TIME 1000 /* ms */
/* Classes ********************************************************************/
class CClientSettingsDlg : public CClientSettingsDlgBase
{
Q_OBJECT
public:
CClientSettingsDlg ( CClient* pNCliP, QWidget* parent = 0,
const char* name = 0, bool modal = FALSE, WFlags f = 0 );
void SetStatus ( const int iMessType, const int iStatus );
protected:
CClient* pClient;
QTimer TimerStatus;
void UpdateDisplay();
public slots:
void OnTimerStatus() { UpdateDisplay(); }
void OnSliderSndBufInChange ( int value );
void OnSliderSndBufOutChange ( int value );
void OnSliderNetBuf ( int value );
void OnSliderNetBufSiFactIn ( int value );
void OnSliderNetBufSiFactOut ( int value );
};

641
src/clientsettingsdlgbase.ui Executable file
View File

@ -0,0 +1,641 @@
<!DOCTYPE UI><UI>
<class>CClientSettingsDlgBase</class>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>CClientSettingsDlgBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
<width>361</width>
<height>263</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>General Settings</string>
</property>
<property stdset="1">
<name>icon</name>
<pixmap>image0</pixmap>
</property>
<property stdset="1">
<name>sizeGripEnabled</name>
<bool>true</bool>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxJitterBuffer</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Jitter Buffer</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<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>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderNetBuf</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Put / Get:</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout9</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDNetwPut</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDNetwGet</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxNetwBuf</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Block Size</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextNetBufSiFactIn</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>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderNetBufSiFactIn</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextNetBufSiFactOut</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Size</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderNetBufSiFactOut</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2_2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Check Ping</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Time!</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxSoundCardBuffers</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Sndcard Buffers</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout12</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout10</cstring>
</property>
<vbox>
<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>TextSndBufIn</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property stdset="1">
<name>text</name>
<string>In</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderSndBufIn</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
</vbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<vbox>
<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>TextSndBufOut</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property stdset="1">
<name>text</name>
<string>Out</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderSndBufOut</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
</vbox>
</widget>
</hbox>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>In / Out:</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout14</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDSoundIn</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDSoundOut</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxMeasureResults</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Debug</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</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>
</vbox>
</widget>
</hbox>
</widget>
<customwidgets>
<customwidget>
<class>CMultiColorLED</class>
<header location="local">multicolorled.h</header>
<sizehint>
<width>13</width>
<height>13</height>
</sizehint>
<container>0</container>
<sizepolicy>
<hordata>0</hordata>
<verdata>0</verdata>
</sizepolicy>
<pixmap>image1</pixmap>
</customwidget>
</customwidgets>
<images>
<image>
<name>image0</name>
<data format="XPM.GZ" length="427">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2ea5248564056503300071f5205c0b2004719541dcb434986c22840b0260c56800454c9918b1c444e54454b1c4c4a424e5a4c4442431a0085008081231c4949511621021656565b042843a908032bade24a832547b21c6a1ba0f08d0fda18ccd6fd8c2009f58ad351700407358e1</data>
</image>
<image>
<name>image1</name>
<data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data>
</image>
</images>
</UI>

View File

@ -28,7 +28,8 @@
/* Implementation *************************************************************/
CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
const char* name, bool modal, WFlags f) : pClient ( pNCliP ),
CLlconClientDlgBase ( parent, name, modal, f )
CLlconClientDlgBase ( parent, name, modal, f ),
ClientSettingsDlg ( pNCliP, 0, 0, FALSE, Qt::WStyle_MinMax )
{
/* add help text to controls */
QString strInpLevH = tr("<b>Input level meter:</b> Shows the level of the "
@ -68,9 +69,6 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
/* init connection button text */
PushButtonConnect->setText ( CON_BUT_CONNECTTEXT );
/* Init timing jitter text label */
TextLabelStdDevTimer->setText ( "" );
/* init input level meter bars */
ProgressBarInputLevelL->setTotalSteps ( NUM_STEPS_INP_LEV_METER );
@ -80,40 +78,6 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
/* init slider controls --- */
/* sound buffer in */
SliderSndBufIn->setRange(2, AUD_SLIDER_LENGTH);
const int iCurNumInBuf = pClient->GetSndInterface()->GetInNumBuf();
SliderSndBufIn->setValue(iCurNumInBuf);
TextSndBufIn->setText("In: " + QString().setNum(iCurNumInBuf));
/* sound buffer out */
SliderSndBufOut->setRange(2, AUD_SLIDER_LENGTH);
const int iCurNumOutBuf = pClient->GetSndInterface()->GetOutNumBuf();
SliderSndBufOut->setValue(iCurNumOutBuf);
TextSndBufOut->setText("Out: " + QString().setNum(iCurNumOutBuf));
/* network buffer */
SliderNetBuf->setRange(0, MAX_NET_BUF_SIZE_NUM_BL);
const int iCurNumNetBuf = pClient->GetSockBufSize();
SliderNetBuf->setValue(iCurNumNetBuf);
TextNetBuf->setText("Size: " + QString().setNum(iCurNumNetBuf));
/* network buffer size factor in */
SliderNetBufSiFactIn->setRange(1, MAX_NET_BLOCK_SIZE_FACTOR);
const int iCurNetBufSiFactIn = pClient->GetNetwBufSizeFactIn();
SliderNetBufSiFactIn->setValue(iCurNetBufSiFactIn);
TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(iCurNetBufSiFactIn * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
/* network buffer size factor out */
SliderNetBufSiFactOut->setRange(1, MAX_NET_BLOCK_SIZE_FACTOR);
const int iCurNetBufSiFactOut = pClient->GetNetwBufSizeFactOut();
SliderNetBufSiFactOut->setValue(iCurNetBufSiFactOut);
TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(iCurNetBufSiFactOut * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
/* audio in fader */
SliderAudInFader->setRange(0, AUD_FADER_IN_MAX);
const int iCurAudInFader = pClient->GetAudioInFader();
@ -134,15 +98,24 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
else
RadioButtonRevSelR->setChecked(true);
/* Settings menu ------------------------------------------------------- */
pSettingsMenu = new QPopupMenu ( this );
CHECK_PTR ( pSettingsMenu );
pSettingsMenu->insertItem ( tr ( "&General Settings..." ), this,
SLOT ( OnOpenGeneralSettings() ) );
/* Main menu bar -------------------------------------------------------- */
pMenu = new QMenuBar(this);
CHECK_PTR(pMenu);
pMenu->insertItem(tr("&?"), new CLlconHelpMenu(this));
pMenu->setSeparator(QMenuBar::InWindowsStyle);
pMenu = new QMenuBar ( this );
CHECK_PTR ( pMenu );
pMenu->insertItem ( tr ( "&Settings" ), pSettingsMenu );
pMenu->insertItem ( tr ( "&?"), new CLlconHelpMenu ( this ) );
pMenu->setSeparator ( QMenuBar::InWindowsStyle );
/* Now tell the layout about the menu */
CLlconClientDlgBaseLayout->setMenuBar(pMenu);
CLlconClientDlgBaseLayout->setMenuBar ( pMenu );
/* connections ---------------------------------------------------------- */
@ -157,19 +130,6 @@ CLlconClientDlg::CLlconClientDlg ( CClient* pNCliP, QWidget* parent,
this, SLOT(OnTimerStatus()));
/* sliders */
QObject::connect(SliderSndBufIn, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderSndBufInChange(int)));
QObject::connect(SliderSndBufOut, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderSndBufOutChange(int)));
QObject::connect(SliderNetBuf, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderNetBuf(int)));
QObject::connect(SliderNetBufSiFactIn, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderNetBufSiFactIn(int)));
QObject::connect(SliderNetBufSiFactOut, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderNetBufSiFactOut(int)));
QObject::connect(SliderAudInFader, SIGNAL(valueChanged(int)),
this, SLOT(OnSliderAudInFader(int)));
QObject::connect(SliderAudReverb, SIGNAL(valueChanged(int)),
@ -247,44 +207,11 @@ void CLlconClientDlg::OnConnectDisconBut ()
}
}
}
void CLlconClientDlg::OnSliderSndBufInChange(int value)
{
pClient->GetSndInterface()->SetInNumBuf(value);
TextSndBufIn->setText("In: " + QString().setNum(value));
UpdateDisplay();
}
void CLlconClientDlg::OnSliderSndBufOutChange(int value)
{
pClient->GetSndInterface()->SetOutNumBuf(value);
TextSndBufOut->setText("Out: " + QString().setNum(value));
UpdateDisplay();
}
void CLlconClientDlg::OnSliderNetBuf(int value)
{
pClient->SetSockBufSize ( value );
TextNetBuf->setText("Size: " + QString().setNum(value));
UpdateDisplay();
}
void CLlconClientDlg::OnSliderNetBufSiFactIn(int value)
void CLlconClientDlg::OnOpenGeneralSettings()
{
pClient->SetNetwBufSizeFactIn ( value );
TextNetBufSiFactIn->setText("In:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
UpdateDisplay();
}
void CLlconClientDlg::OnSliderNetBufSiFactOut(int value)
{
pClient->SetNetwBufSizeFactOut ( value );
TextNetBufSiFactOut->setText("Out:\n" + QString().setNum(
double(value * MIN_BLOCK_DURATION_MS), 'f', 2) +
" ms");
UpdateDisplay();
// open general settings dialog
ClientSettingsDlg.show();
}
void CLlconClientDlg::OnTimerSigMet ()
@ -331,43 +258,32 @@ void CLlconClientDlg::UpdateDisplay()
{
TextLabelStatus->setText ( tr ( "disconnected" ) );
}
/* response time */
TextLabelStdDevTimer->setText(QString().
setNum(pClient->GetTimingStdDev(), 'f', 2) + " ms");
}
void CLlconClientDlg::customEvent(QCustomEvent* Event)
void CLlconClientDlg::customEvent ( QCustomEvent* Event )
{
if (Event->type() == QEvent::User + 11)
if ( Event->type() == QEvent::User + 11 )
{
const int iMessType = ((CLlconEvent*) Event)->iMessType;
const int iStatus = ((CLlconEvent*) Event)->iStatus;
const int iMessType = ( (CLlconEvent*) Event ) ->iMessType;
const int iStatus = ( (CLlconEvent*) Event ) ->iStatus;
switch(iMessType)
switch ( iMessType )
{
case MS_SOUND_IN:
CLEDSoundIn->SetLight(iStatus);
break;
case MS_SOUND_OUT:
CLEDSoundOut->SetLight(iStatus);
break;
case MS_JIT_BUF_PUT:
CLEDNetwPut->SetLight(iStatus);
break;
case MS_JIT_BUF_GET:
CLEDNetwGet->SetLight(iStatus);
case MS_JIT_BUF_GET:
// show overall status -> if any LED goes red, this LED will go red
CLEDOverallStatus->SetLight ( iStatus );
break;
case MS_RESET_ALL:
CLEDSoundIn->Reset();
CLEDSoundOut->Reset();
CLEDNetwPut->Reset();
CLEDNetwGet->Reset();
CLEDOverallStatus->Reset();
break;
}
}
}
// update general settings dialog, too
ClientSettingsDlg.SetStatus ( iMessType, iStatus );
}
}

View File

@ -35,7 +35,8 @@
#include <qlayout.h>
#include "global.h"
#include "client.h"
#include "multicolorled.h"
#include "multicolorled.h"
#include "clientsettingsdlg.h"
#ifdef _WIN32
# include "../windows/moc/llconclientdlgbase.h"
#else
@ -72,26 +73,25 @@ public:
virtual ~CLlconClientDlg ();
protected:
CClient* pClient;
bool bConnected;
QTimer TimerSigMet;
QTimer TimerStatus;
CClient* pClient;
bool bConnected;
QTimer TimerSigMet;
QTimer TimerStatus;
virtual void customEvent ( QCustomEvent* Event );
virtual void closeEvent ( QCloseEvent * Event );
void UpdateDisplay();
virtual void customEvent ( QCustomEvent* Event );
virtual void closeEvent ( QCloseEvent * Event );
void UpdateDisplay();
QMenuBar* pMenu;
QPopupMenu* pSettingsMenu;
QMenuBar* pMenu;
CClientSettingsDlg ClientSettingsDlg;
public slots:
void OnConnectDisconBut();
void OnTimerSigMet();
void OnTimerStatus() { UpdateDisplay(); }
void OnSliderSndBufInChange ( int value );
void OnSliderSndBufOutChange ( int value );
void OnSliderNetBuf ( int value );
void OnSliderNetBufSiFactIn ( int value );
void OnSliderNetBufSiFactOut ( int value );
void OnTimerStatus() { UpdateDisplay(); }
void OnOpenGeneralSettings();
void OnSliderAudInFader ( int value ) { pClient->SetAudioInFader(value); }
void OnSliderAudReverb ( int value )
{ pClient->SetReverbLevel ( AUD_REVERB_MAX - value ); }

View File

@ -11,8 +11,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>776</width>
<height>287</height>
<width>445</width>
<height>289</height>
</rect>
</property>
<property stdset="1">
@ -368,30 +368,68 @@
</hbox>
</widget>
<widget>
<class>QLabel</class>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabelStatus</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>frameShape</name>
<enum>Panel</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Sunken</enum>
</property>
<property stdset="1">
<name>text</name>
<string>TextLabelStatus</string>
<cstring>Layout15</cstring>
</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>TextLabelStatus</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>frameShape</name>
<enum>Panel</enum>
</property>
<property stdset="1">
<name>frameShadow</name>
<enum>Sunken</enum>
</property>
<property stdset="1">
<name>text</name>
<string>TextLabelStatus</string>
</property>
</widget>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDOverallStatus</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
@ -601,580 +639,6 @@ Selection</string>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxJitterBuffer</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Jitter Buffer</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<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>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderNetBuf</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Put / Get:</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout9</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDNetwPut</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDNetwGet</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxNetwBuf</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Block Size</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextNetBufSiFactIn</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>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderNetBufSiFactIn</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextNetBufSiFactOut</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Size</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderNetBufSiFactOut</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2_2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Check Ping</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel2_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Time!</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxSoundCardBuffers</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Sndcard Buffers</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout12</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout10</cstring>
</property>
<vbox>
<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>TextSndBufIn</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property stdset="1">
<name>text</name>
<string>In</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderSndBufIn</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
</vbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<vbox>
<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>TextSndBufOut</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property stdset="1">
<name>text</name>
<string>Out</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>SliderSndBufOut</cstring>
</property>
<property stdset="1">
<name>pageStep</name>
<number>1</number>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Both</enum>
</property>
</widget>
</vbox>
</widget>
</hbox>
</widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>In / Out:</string>
</property>
<property stdset="1">
<name>alignment</name>
<set>AlignCenter</set>
</property>
<property>
<name>hAlign</name>
</property>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout14</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDSoundIn</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
<widget>
<class>CMultiColorLED</class>
<property stdset="1">
<name>name</name>
<cstring>CLEDSoundOut</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
<property stdset="1">
<name>maximumSize</name>
<size>
<width>13</width>
<height>13</height>
</size>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>GroupBoxMeasureResults</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Debug</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</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>
</vbox>
</widget>
</hbox>
</widget>
<customwidgets>

View File

@ -28,7 +28,8 @@ rem\****************************************************************************
rem .h --------------
%qtdir%\bin\moc.exe ..\src\util.h -o moc\moc_util.cpp
%qtdir%\bin\moc.exe ..\src\multicolorled.h -o moc\moc_multicolorled.cpp
%qtdir%\bin\moc.exe ..\src\llconclientdlg.h -o moc\moc_llconclientdlg.cpp
%qtdir%\bin\moc.exe ..\src\llconclientdlg.h -o moc\moc_llconclientdlg.cpp
%qtdir%\bin\moc.exe ..\src\clientsettingsdlg.h -o moc\moc_clientsettingsdlg.cpp
%qtdir%\bin\moc.exe ..\src\llconserverdlg.h -o moc\moc_llconserverdlg.cpp
%qtdir%\bin\moc.exe ..\src\server.h -o moc\moc_server.cpp
%qtdir%\bin\moc.exe ..\src\client.h -o moc\moc_client.cpp
@ -45,6 +46,10 @@ rem .ui -------------
%qtdir%\bin\uic.exe ..\src\llconclientdlgbase.ui -o moc\llconclientdlgbase.h
%qtdir%\bin\uic.exe ..\src\llconclientdlgbase.ui -i llconclientdlgbase.h -o moc\llconclientdlgbase.cpp
%qtdir%\bin\moc.exe moc\llconclientdlgbase.h -o moc\moc_llconclientdlgbase.cpp
%qtdir%\bin\uic.exe ..\src\clientsettingsdlgbase.ui -o moc\clientsettingsdlgbase.h
%qtdir%\bin\uic.exe ..\src\clientsettingsdlgbase.ui -i clientsettingsdlgbase.h -o moc\clientsettingsdlgbase.cpp
%qtdir%\bin\moc.exe moc\clientsettingsdlgbase.h -o moc\moc_clientsettingsdlgbase.cpp
%qtdir%\bin\uic.exe ..\src\llconserverdlgbase.ui -o moc\llconserverdlgbase.h
%qtdir%\bin\uic.exe ..\src\llconserverdlgbase.ui -i llconserverdlgbase.h -o moc\llconserverdlgbase.cpp

View File

@ -101,6 +101,10 @@ SOURCE=.\moc\aboutdlgbase.cpp
# End Source File
# Begin Source File
SOURCE=.\moc\clientsettingsdlgbase.cpp
# End Source File
# Begin Source File
SOURCE=.\moc\llconclientdlgbase.cpp
# End Source File
# Begin Source File
@ -121,6 +125,10 @@ SOURCE=.\moc\moc_client.cpp
# End Source File
# Begin Source File
SOURCE=.\moc\moc_clientsettingsdlg.cpp
# End Source File
# Begin Source File
SOURCE=.\moc\moc_llconclientdlg.cpp
# End Source File
# Begin Source File
@ -174,6 +182,10 @@ SOURCE=..\src\client.cpp
# End Source File
# Begin Source File
SOURCE=..\src\clientsettingsdlg.cpp
# End Source File
# Begin Source File
SOURCE=..\src\llconclientdlg.cpp
# End Source File
# Begin Source File
@ -238,6 +250,10 @@ SOURCE=..\src\client.h
# End Source File
# Begin Source File
SOURCE=..\src\clientsettingsdlg.h
# End Source File
# Begin Source File
SOURCE=..\src\global.h
# End Source File
# Begin Source File