eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

move indicator label next to pan label to save some vertical space

Browse source
This commit is contained in:
Volker Fischer 2020-05-21 20:27:01 +02:00
parent 3427c9d260
commit 7a7cfe53fe
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/audiomixerboard.cpp
View file

@ -58,6 +58,7 @@ CChannelFader::CChannelFader ( QWidget* pNW,
QHBoxLayout* pLabelGrid = new QHBoxLayout ( pLabelInstBox ); QHBoxLayout* pLabelGrid = new QHBoxLayout ( pLabelInstBox );
QVBoxLayout* pLabelPictGrid = new QVBoxLayout ( ); QVBoxLayout* pLabelPictGrid = new QVBoxLayout ( );
QVBoxLayout* pPanGrid = new QVBoxLayout ( ); QVBoxLayout* pPanGrid = new QVBoxLayout ( );
QHBoxLayout* pPanInfoGrid = new QHBoxLayout ( );
// setup channel level // setup channel level
plbrChannelLevel->setContentsMargins ( 0, 3, 2, 3 ); plbrChannelLevel->setContentsMargins ( 0, 3, 2, 3 );
@ -74,8 +75,10 @@ CChannelFader::CChannelFader ( QWidget* pNW,
pPan->setValue ( AUD_MIX_PAN_MAX / 2 ); pPan->setValue ( AUD_MIX_PAN_MAX / 2 );
pPan->setFixedSize ( 55, 55 ); pPan->setFixedSize ( 55, 55 );
pPan->setNotchesVisible ( true ); pPan->setNotchesVisible ( true );
pPanGrid->addWidget ( pPanLabel, 0, Qt::AlignLeft ); pPanInfoGrid->addWidget ( pPanLabel, 0, Qt::AlignLeft );
pPanGrid->addWidget ( pPan, 0, Qt::AlignHCenter ); pPanInfoGrid->addWidget ( pInfoLabel, 0, Qt::AlignRight );
pPanGrid->addLayout ( pPanInfoGrid );
pPanGrid->addWidget ( pPan, 0, Qt::AlignHCenter );
// setup fader tag label (black bold text which is centered) // setup fader tag label (black bold text which is centered)
plblLabel->setTextFormat ( Qt::PlainText ); plblLabel->setTextFormat ( Qt::PlainText );
@ -112,7 +115,6 @@ CChannelFader::CChannelFader ( QWidget* pNW,
pMuteSoloGrid->addWidget ( pcbMute, 0, Qt::AlignLeft ); pMuteSoloGrid->addWidget ( pcbMute, 0, Qt::AlignLeft );
pMuteSoloGrid->addWidget ( pcbSolo, 0, Qt::AlignLeft ); pMuteSoloGrid->addWidget ( pcbSolo, 0, Qt::AlignLeft );
pMainGrid->addWidget ( pInfoLabel, 0, Qt::AlignHCenter );
pMainGrid->addLayout ( pPanGrid ); pMainGrid->addLayout ( pPanGrid );
pMainGrid->addWidget ( pLevelsBox, 0, Qt::AlignHCenter ); pMainGrid->addWidget ( pLevelsBox, 0, Qt::AlignHCenter );
pMainGrid->addWidget ( pMuteSoloBox, 0, Qt::AlignHCenter ); pMainGrid->addWidget ( pMuteSoloBox, 0, Qt::AlignHCenter );
@ -355,7 +357,7 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute )
{ {
if ( bIsMute ) if ( bIsMute )
{ {
// utf8 SPEAKER WITH CANCELLATION STROKE (U+1F507) // show orange utf8 SPEAKER WITH CANCELLATION STROKE (U+1F507)
pInfoLabel->setText ( "<font color=""orange"">&#128263;</font>" ); pInfoLabel->setText ( "<font color=""orange"">&#128263;</font>" );
} }
else else