added two buttons on the main window

This commit is contained in:
Volker Fischer 2011-05-28 20:07:57 +00:00
parent 3f17145527
commit 037cdeaf83
6 changed files with 1036 additions and 995 deletions

View File

@ -122,37 +122,17 @@ void CChannelFader::SetGUIDesign ( const EGUIDesign eNewDesign )
"QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" ); "QSlider::handle { image: url(:/png/fader/res/faderhandle.png); }" );
// mute button // mute button
pcbMute->setStyleSheet (
"QCheckBox::indicator { width: 38px;"
" height: 21px; }"
"QCheckBox::indicator:unchecked {"
" image: url(:/png/fader/res/ledbuttonnotpressed.png); }"
"QCheckBox::indicator:checked {"
" image: url(:/png/fader/res/ledbuttonpressed.png); }"
"QCheckBox { color: rgb(148, 148, 148);"
" font: bold; }" );
pcbMute->setText ( "MUTE" ); pcbMute->setText ( "MUTE" );
// solo button // solo button
pcbSolo->setStyleSheet (
"QCheckBox::indicator { width: 38px;"
" height: 21px; }"
"QCheckBox::indicator:unchecked {"
" image: url(:/png/fader/res/ledbuttonnotpressed.png); }"
"QCheckBox::indicator:checked {"
" image: url(:/png/fader/res/ledbuttonpressed.png); }"
"QCheckBox { color: rgb(148, 148, 148);"
" font: bold; }" );
pcbSolo->setText ( "SOLO" ); pcbSolo->setText ( "SOLO" );
break; break;
default: default:
// reset style sheet and set original paramters // reset style sheet and set original paramters
pFader->setStyleSheet ( "" ); pFader->setStyleSheet ( "" );
pcbMute->setStyleSheet ( "" ); pcbMute->setText ( "Mute" );
pcbSolo->setStyleSheet ( "" ); pcbSolo->setText ( "Solo" );
pcbMute->setText ( "Mute" );
pcbSolo->setText ( "Solo" );
break; break;
} }
} }

View File

@ -237,6 +237,9 @@
<property name="text" > <property name="text" >
<string>Driver Setup</string> <string>Driver Setup</string>
</property> </property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>

File diff suppressed because it is too large Load Diff

View File

@ -85,6 +85,7 @@ public:
protected: protected:
void SetGUIDesign ( const EGUIDesign eNewDesign ); void SetGUIDesign ( const EGUIDesign eNewDesign );
void SetMyWindowTitle ( const int iNumClients ); void SetMyWindowTitle ( const int iNumClients );
void ShowGeneralSettings();
void ShowChatWindow(); void ShowChatWindow();
void UpdateAudioFaderSlider(); void UpdateAudioFaderSlider();
void UpdateRevSelection(); void UpdateRevSelection();
@ -124,10 +125,12 @@ public slots:
void OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr, void OnCLPingTimeWithNumClientsReceived ( CHostAddress InetAddr,
int iPingTime, int iPingTime,
int iNumClients ); int iNumClients );
void OnOpenGeneralSettings();
void OnOpenChatDialog() void OnOpenGeneralSettings() { ShowGeneralSettings(); }
{ ShowChatWindow(); } void OnOpenChatDialog() { ShowChatWindow(); }
void OnSettingsStateChanged ( int value );
void OnChatStateChanged ( int value );
void OnAudioPanValueChanged ( int value ); void OnAudioPanValueChanged ( int value );

View File

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>345</width> <width>345</width>
<height>338</height> <height>382</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -426,6 +426,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="chbSettings" >
<property name="text" >
<string>Settings</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chbChat" >
<property name="text" >
<string>Chat</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="lblServerTag" > <widget class="QLabel" name="lblServerTag" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -752,6 +766,8 @@
<tabstops> <tabstops>
<tabstop>butConnect</tabstop> <tabstop>butConnect</tabstop>
<tabstop>edtFaderTag</tabstop> <tabstop>edtFaderTag</tabstop>
<tabstop>chbChat</tabstop>
<tabstop>chbSettings</tabstop>
<tabstop>sldAudioPan</tabstop> <tabstop>sldAudioPan</tabstop>
<tabstop>sldAudioReverb</tabstop> <tabstop>sldAudioReverb</tabstop>
<tabstop>rbtReverbSelL</tabstop> <tabstop>rbtReverbSelL</tabstop>

View File

@ -727,7 +727,7 @@ public:
void Init ( const int iNewBlockLengthAtSystemSampleRate, void Init ( const int iNewBlockLengthAtSystemSampleRate,
const int iNewSystemSampleRateHz, const int iNewSystemSampleRateHz,
const int iHistoryLengthTimeSec, const int iHistoryLengthTimeSec,
const int iNewNewValueBoundFactor = 4 ) const int iNewNewValueBoundFactor = 10 )
{ {
// store block size and new value bound factor // store block size and new value bound factor
iBlockLengthAtSystemSampleRate = iNewBlockLengthAtSystemSampleRate; iBlockLengthAtSystemSampleRate = iNewBlockLengthAtSystemSampleRate;