From 85951a6588abc032a8cd01792a351e9885455a72 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Fri, 8 May 2009 04:34:06 +0000
Subject: [PATCH] new fader tag style

---
 src/audiomixerboard.cpp | 34 ++++++++++++++++++++++------------
 src/audiomixerboard.h   |  4 ++--
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index e4eecb4e..54bd522a 100755
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -50,6 +50,14 @@ CChannelFader::CChannelFader ( QWidget*     pNW,
 pcbSolo->setEnabled ( false );
 
 
+    // setup fader tag label (use white background of label)
+    QPalette newPalette = pLabel->palette();
+    newPalette.setColor ( QPalette::Active, QPalette::Window,
+        newPalette.color ( QPalette::Active, QPalette::Base ) );
+
+    pLabel->setPalette ( newPalette );
+    pLabel->setAutoFillBackground ( true );
+
     // add user controls to grid
     pMainGrid->addWidget( pFader,  0, Qt::AlignHCenter );
     pMainGrid->addWidget( pcbMute, 0, Qt::AlignHCenter );
@@ -127,24 +135,27 @@ void CChannelFader::SetText ( const QString sText )
 {
     const int iBreakPos = 7;
 
+    // make sure we insert an HTML space ("&nbsp;") at each beginning and end
+    // of line for nicer look
+
     // break text at predefined position, if text is too short, break anyway to
     // make sure we have two lines for fader tag
     QString sModText = sText;
 
     if ( sModText.length() > iBreakPos )
     {
-        sModText.insert ( iBreakPos, QString ( "<br>" ) );
+        sModText.insert ( iBreakPos, QString ( "&nbsp;<br>&nbsp;" ) );
     }
     else
     {
         // insert line break at the beginning of the string -> make sure
         // if we only have one line that the text appears at the bottom line
-        sModText.insert ( 0, QString ( "<br>" ) );
+        sModText.insert ( 0, QString ( "&nbsp;<br>&nbsp;" ) );
     }
 
-    // use bold text
-    sModText.prepend ( "<b>" );
-    sModText.append ( "</b>" );
+    // use bold centered text
+    sModText.prepend ( "<center><b>&nbsp;" );
+    sModText.append ( "&nbsp;</b></center>" );
 
     pLabel->setText ( sModText );
 }
@@ -156,17 +167,16 @@ double CChannelFader::CalcFaderGain ( const int value )
     return static_cast<double> ( value ) / AUD_MIX_FADER_MAX;
 }
 
-CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) : QFrame ( parent, f )
+CAudioMixerBoard::CAudioMixerBoard ( QWidget* parent, Qt::WindowFlags f ) :
+    QGroupBox ( parent )
 {
-    // set modified style
-    setFrameShape  ( QFrame::StyledPanel );
-    setFrameShadow ( QFrame::Sunken );
+    // set title text and title properties
+    setTitle ( "Server" );
+    setAlignment ( Qt::AlignHCenter );
 
-    // add hboxlayout with horizontal spacer
+    // add hboxlayout
     pMainLayout = new QHBoxLayout ( this );
 
-    pMainLayout->addItem ( new QSpacerItem ( 0, 0, QSizePolicy::Expanding ) );
-
     // create all mixer controls and make them invisible
     vecpChanFader.Init ( MAX_NUM_CHANNELS );
     for ( int i = 0; i < MAX_NUM_CHANNELS; i++ )
diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h
index aefbb9a0..d55f8443 100755
--- a/src/audiomixerboard.h
+++ b/src/audiomixerboard.h
@@ -25,7 +25,7 @@
 #if !defined ( MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_ )
 #define MIXERBOARD_H__FD6B49E1606C2AC__INCLUDED_
 
-#include <qframe.h>
+#include <qgroupbox.h>
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
@@ -84,7 +84,7 @@ signals:
 };
 
 
-class CAudioMixerBoard : public QFrame
+class CAudioMixerBoard : public QGroupBox
 {
     Q_OBJECT