From d3644c447da68426abea5271a6908672f3a37761 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 9 Dec 2006 11:17:51 +0000 Subject: [PATCH] fixed alignment for mixer fader --- src/llconclientdlg.cpp | 35 ++++++++++++++++++++++++----------- src/llconclientdlg.h | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/src/llconclientdlg.cpp b/src/llconclientdlg.cpp index 20cb660f..fa1a8d89 100755 --- a/src/llconclientdlg.cpp +++ b/src/llconclientdlg.cpp @@ -336,8 +336,8 @@ for ( i = 0; i < vecChanInfo.Size(); i++ ) { QHostAddress addrTest ( vecChanInfo[i].veciIpAddr ); - vecpChanFader[i]->Show(); vecpChanFader[i]->SetText ( addrTest.toString().latin1() ); + vecpChanFader[i]->Show(); @@ -391,9 +391,9 @@ void CLlconClientDlg::customEvent ( QCustomEvent* Event ) // Help classes --------------------------------------------------------------- -CLlconClientDlg::CChannelFader::CChannelFader ( QWidget* pNW, +CLlconClientDlg::CChannelFader::CChannelFader ( QWidget* pNW, QHBoxLayout* pNPtLy, - QString sName ) : + QString sName ) : pParentLayout ( pNPtLy ) { // create new GUI control objects and store pointers to them @@ -401,9 +401,6 @@ CLlconClientDlg::CChannelFader::CChannelFader ( QWidget* pNW, pFader = new QSlider ( Qt::Vertical, pNW ); pLabel = new QLabel ( "", pNW ); - // add slider to grid as position 0 / 0 - pMainGrid->addWidget( pFader, 0, 0 ); - // setup slider pFader->setPageStep ( 1 ); pFader->setTickmarks ( QSlider::Both ); @@ -414,17 +411,33 @@ CLlconClientDlg::CChannelFader::CChannelFader ( QWidget* pNW, pFader->setValue ( 0 ); pFader->setEnabled ( FALSE ); - - // add label to grid - pMainGrid->addWidget( pLabel, 1, 0 ); - // set label text pLabel->setText ( sName ); + // add slider to grid as position 0 / 0 + pMainGrid->addWidget( pFader, 0, 0, Qt::AlignHCenter ); + + // add label to grid as position 1 / 0 + pMainGrid->addWidget( pLabel, 1, 0, Qt::AlignHCenter ); + pParentLayout->insertLayout ( 0, pMainGrid ); } void CLlconClientDlg::CChannelFader::SetText ( const std::string sText ) { - pLabel->setText ( sText.c_str() ); + const int iBreakPos = 6; + + // break text at predefined position + QString sModText = sText.c_str(); + + if ( sModText.length() > iBreakPos ) + { + sModText.insert ( iBreakPos, QString ( "
" ) ); + } + + // use bold text + sModText.prepend ( "" ); + sModText.append ( "" ); + + pLabel->setText ( sModText ); } diff --git a/src/llconclientdlg.h b/src/llconclientdlg.h index a2e5cb41..1a99a008 100755 --- a/src/llconclientdlg.h +++ b/src/llconclientdlg.h @@ -103,7 +103,7 @@ protected: QTimer TimerStatus; virtual void customEvent ( QCustomEvent* Event ); - virtual void closeEvent ( QCloseEvent * Event ); + virtual void closeEvent ( QCloseEvent * Event ); void UpdateDisplay(); QPopupMenu* pSettingsMenu;