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

use a separate layout for the pan controls

Browse source
This commit is contained in:
Volker Fischer 2020-05-20 20:58:11 +02:00
parent 3339661894
commit 98aecb1d26
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -15,8 +15,6 @@
- support intermediate Reaper RPP file while recording, coded by pljones (Ticket #170) - support intermediate Reaper RPP file while recording, coded by pljones (Ticket #170)
TODO fix incorrect what's this help texts
TODO fix problem with panning and GUI (vertical scroll bar issue in mixer board) TODO fix problem with panning and GUI (vertical scroll bar issue in mixer board)
TODO Keep lrelease? Does it work as expected? TODO Keep lrelease? Does it work as expected?
@ -30,6 +28,8 @@ TODO WIP support internationalization
TODO show mute state of others TODO show mute state of others
TODO fix incorrect what's this help texts

11
src/audiomixerboard.cpp
View file

@ -56,6 +56,7 @@ CChannelFader::CChannelFader ( QWidget* pNW,
QVBoxLayout* pMuteSoloGrid = new QVBoxLayout ( pMuteSoloBox ); QVBoxLayout* pMuteSoloGrid = new QVBoxLayout ( pMuteSoloBox );
QHBoxLayout* pLabelGrid = new QHBoxLayout ( pLabelInstBox ); QHBoxLayout* pLabelGrid = new QHBoxLayout ( pLabelInstBox );
QVBoxLayout* pLabelPictGrid = new QVBoxLayout ( ); QVBoxLayout* pLabelPictGrid = new QVBoxLayout ( );
QVBoxLayout* pPanGrid = new QVBoxLayout ( );
// setup channel level // setup channel level
plbrChannelLevel->setContentsMargins ( 0, 3, 2, 3 ); plbrChannelLevel->setContentsMargins ( 0, 3, 2, 3 );
@ -72,6 +73,8 @@ 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 );
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 );
@ -84,6 +87,9 @@ CChannelFader::CChannelFader ( QWidget* pNW,
// set margins of the layouts to zero to get maximum space for the controls // set margins of the layouts to zero to get maximum space for the controls
pMainGrid->setContentsMargins ( 0, 0, 0, 0 ); pMainGrid->setContentsMargins ( 0, 0, 0, 0 );
pPanGrid->setContentsMargins ( 0, 0, 0, 0 );
pPanGrid->setSpacing ( 0 ); // only minimal space
pLevelsGrid->setContentsMargins ( 0, 0, 0, 0 ); pLevelsGrid->setContentsMargins ( 0, 0, 0, 0 );
pLevelsGrid->setSpacing ( 0 ); // only minimal space pLevelsGrid->setSpacing ( 0 ); // only minimal space
@ -105,8 +111,7 @@ 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 ( pPanLabel, 0, Qt::AlignLeft ); pMainGrid->addLayout ( pPanGrid );
pMainGrid->addWidget ( pPan, 0, Qt::AlignHCenter );
pMainGrid->addWidget ( pLevelsBox, 0, Qt::AlignHCenter ); pMainGrid->addWidget ( pLevelsBox, 0, Qt::AlignHCenter );
pMainGrid->addWidget ( pMuteSoloBox, 0, Qt::AlignHCenter ); pMainGrid->addWidget ( pMuteSoloBox, 0, Qt::AlignHCenter );
pMainGrid->addWidget ( pLabelInstBox ); pMainGrid->addWidget ( pLabelInstBox );
@ -221,7 +226,7 @@ bool CChannelFader::GetDisplayChannelLevel()
void CChannelFader::SetDisplayPans ( const bool eNDP ) void CChannelFader::SetDisplayPans ( const bool eNDP )
{ {
pPanLabel->setHidden ( !eNDP ); pPanLabel->setHidden ( !eNDP );
pPan->setHidden ( !eNDP ); pPan->setHidden ( !eNDP );
} }
void CChannelFader::SetupFaderTag ( const ESkillLevel eSkillLevel ) void CChannelFader::SetupFaderTag ( const ESkillLevel eSkillLevel )