diff --git a/src/aboutdlgbase.ui b/src/aboutdlgbase.ui
index d885ac7d..8617952d 100755
--- a/src/aboutdlgbase.ui
+++ b/src/aboutdlgbase.ui
@@ -6,7 +6,7 @@
0
0
630
- 397
+ 465
@@ -25,149 +25,172 @@
true
-
- 6
-
-
- 9
-
-
- 9
-
-
- 9
-
-
- 9
-
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- TextLabelVersion
-
-
- Qt::AlignCenter
-
-
- false
-
-
-
-
-
- -
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
- Author: Volker Fischer
+
+
+ 6
-
- false
+
+ 0
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ TextLabelVersion
+
+
+ Qt::AlignCenter
+
+
+ false
+
+
+
+
-
-
-
- Copyright (C) 2005 - 2011
+
+
+ 6
-
- false
+
+ 0
-
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+ Author: Volker Fischer
+
+
+ false
+
+
+
+ -
+
+
+ Copyright (C) 2005 - 2011
+
+
+ false
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 20
+ 20
+
+
+
+
+
-
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- 20
- 20
-
-
-
+
+
-
+
+
+
+
+
+ :/png/main/res/logopicture.png
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Minimum
+
+
+
+ 20
+ 1
+
+
+
+
+
diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index 350de14b..8219509a 100755
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -152,13 +152,6 @@ 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;
@@ -335,36 +328,7 @@ CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) :
void CAudioMixerBoard::SetGUIDesign ( const EGUIDesign eNewDesign )
{
- // apply GUI design to current window
- switch ( eNewDesign )
- {
- case GD_ORIGINAL:
-/*
- // group box
- setStyleSheet (
- "QGroupBox { 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; }"
- "QGroupBox::title { margin-top: 13px;"
- " margin-left: 35px;"
- " background-color: transparent;"
- " color: rgb(148, 148, 148); }" );
- layout()->setMargin ( 3 );
-*/
- break;
-
- default:
- // reset style sheet and set original paramters
- setStyleSheet ( "" );
- layout()->setMargin ( 9 );
- break;
- }
-
- // also apply GUI design to child GUI controls
+ // apply GUI design to child GUI controls
for ( int i = 0; i < USED_NUM_CHANNELS; i++ )
{
vecpChanFader[i]->SetGUIDesign ( eNewDesign );
diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp
index 6ed3bb43..2e081f05 100755
--- a/src/llconclientdlg.cpp
+++ b/src/llconclientdlg.cpp
@@ -823,98 +823,16 @@ void CLlconClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign )
" 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;"
- " border-top: 34px transparent;"
- " border-bottom: 40px transparent;"
- " border-left: 30px transparent;"
- " border-right: 40px transparent;"
- " padding: -5px;"
- " margin: -5px, -5px, 0px, 0px; }"
- "QGroupBox::title { margin-top: 13px;"
- " margin-left: 35px;"
- " 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);"
- " width: 45px; }"
- "QSlider::groove { image: url(); }"
- "QSlider::handle { image: url(:/png/fader/res/faderhandlesmall.png); }" );
- TextLabelAudFader->setStyleSheet (
- "QLabel { color: rgb(148, 148, 148);"
- " font: bold; }" );
- TextAudInFader->setStyleSheet (
- "QLabel { color: rgb(148, 148, 148);"
- " font: bold; }" );
-
- // Reverberation
- SliderAudReverb->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); }" );
-
- RadioButtonRevSelL->setStyleSheet (
- "QRadioButton { color: rgb(148, 148, 148);"
- " font: bold; }" );
- RadioButtonRevSelR->setStyleSheet (
- "QRadioButton { color: rgb(148, 148, 148);"
- " font: bold; }" );
-
- TextLabelAudReverb->setStyleSheet (
- "QLabel { color: rgb(148, 148, 148);"
- " font: bold; }" );
-*/
+ "QLabel { color: rgb(148, 148, 148);"
+ " font: bold; }"
+ "QRadioButton { color: rgb(148, 148, 148);"
+ " font: bold; }"
+ "QGroupBox::title { color: rgb(148, 148, 148); }" );
break;
default:
// reset style sheet and set original paramters
-
-/*
-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; }");
-*/
-// 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;
}