Skip to content

Improve Meterstyle Naming options #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pljones merged 1 commit into from
Feb 9, 2022
Merged

Improve Meterstyle Naming options #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/audiomixerboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,33 +268,33 @@ void CChannelFader::SetMeterStyle ( const EMeterStyle eNewMeterStyle )

switch ( eNewMeterStyle )
{
case MT_BAR:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_BAR );
case MT_BAR_NARROW:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_BAR_NARROW );
// Fader height controls the distribution of the LEDs, if the value is too small the fader might not be movable
pFader->setMinimumHeight ( 120 );
pFader->setMinimumHeight ( 85 );
break;

case MT_SLIM_BAR:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_SLIM_BAR );
case MT_BAR_WIDE:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_BAR_WIDE );
// Fader height controls the distribution of the LEDs, if the value is too small the fader might not be movable
pFader->setMinimumHeight ( 85 );
pFader->setMinimumHeight ( 120 );
break;

case MT_SLIM_LED:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_SLIM_LED );
case MT_LED_ROUND_SMALL:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_LED_ROUND_SMALL );
// Fader height controls the distribution of the LEDs, if the value is too small the fader might not be movable
pFader->setMinimumHeight ( 162 );
pFader->setMinimumHeight ( 85 );
break;

case MT_SMALL_LED:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_SMALL_LED );
case MT_LED_ROUND_BIG:
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_LED_ROUND_BIG );
// Fader height controls the distribution of the LEDs, if the value is too small the fader might not be movable
pFader->setMinimumHeight ( 85 );
pFader->setMinimumHeight ( 162 );
break;

default:
// reset style sheet and set original parameters
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_LED );
plbrChannelLevel->SetLevelMeterType ( CLevelMeter::MT_LED_STRIPE );
// Fader height controls the distribution of the LEDs, if the value is too small the fader might not be movable
pFader->setMinimumHeight ( 120 );
break;
Expand Down
2 changes: 1 addition & 1 deletion src/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ CClient::CClient ( const quint16 iPortNumber,
bFraSiFactDefSupported ( false ),
bFraSiFactSafeSupported ( false ),
eGUIDesign ( GD_ORIGINAL ),
eMeterStyle ( MT_LED ),
eMeterStyle ( MT_LED_STRIPE ),
bEnableOPUS64 ( false ),
bJitterBufferOK ( true ),
bEnableIPv6 ( bNEnableIPv6 ),
Expand Down
30 changes: 15 additions & 15 deletions src/clientdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,29 +1393,29 @@ void CClientDlg::SetMeterStyle ( const EMeterStyle eNewMeterStyle )
// apply MeterStyle to current window
switch ( eNewMeterStyle )
{
case MT_LED:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_LED );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_LED );
case MT_LED_STRIPE:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_LED_STRIPE );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_LED_STRIPE );
break;

case MT_SLIM_LED:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_SLIM_LED );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_SLIM_LED );
case MT_LED_ROUND_BIG:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_LED_ROUND_BIG );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_LED_ROUND_BIG );
break;

case MT_BAR:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_BAR );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_BAR );
case MT_BAR_WIDE:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_BAR_WIDE );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_BAR_WIDE );
break;

case MT_SLIM_BAR:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_BAR );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_BAR );
case MT_BAR_NARROW:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_BAR_WIDE );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_BAR_WIDE );
break;

case MT_SMALL_LED:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_SLIM_LED );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_SLIM_LED );
case MT_LED_ROUND_SMALL:
lbrInputLevelL->SetLevelMeterType ( CLevelMeter::MT_LED_ROUND_BIG );
lbrInputLevelR->SetLevelMeterType ( CLevelMeter::MT_LED_ROUND_BIG );
break;
}

Expand Down
16 changes: 8 additions & 8 deletions src/clientsettingsdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,9 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
// MeterStyle
lblMeterStyle->setWhatsThis ( "<b>" + tr ( "Meter Style" ) + ":</b> " +
tr ( "Select the meter style to be used for the level meters. The "
"Narrow Bar and Small LEDs options only apply to the mixerboard. When "
"Narrow Bar is selected, the input meters are set to Bar. When "
"Small LEDs is selected, the input meters are set to Round LEDs. "
"Bar (narrow) and LEDs (round, small) options only apply to the mixerboard. When "
"Bar (narrow) is selected, the input meters are set to Bar (wide). When "
"LEDs (round, small) is selected, the input meters are set to LEDs (round, big). "
"The remaining options apply to the mixerboard and input meters." ) );

cbxMeterStyle->setAccessibleName ( tr ( "Meter Style combo box" ) );
Expand Down Expand Up @@ -440,11 +440,11 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet

// MeterStyle combo box
cbxMeterStyle->clear();
cbxMeterStyle->addItem ( tr ( "LEDs" ) ); // MT_LED
cbxMeterStyle->addItem ( tr ( "Bar" ) ); // MT_BAR
cbxMeterStyle->addItem ( tr ( "Narrow Bar" ) ); // MT_SLIM_BAR
cbxMeterStyle->addItem ( tr ( "Round LEDs" ) ); // MT_SLIM_LED
cbxMeterStyle->addItem ( tr ( "Small LEDs" ) ); // MT_SMALL_LED
cbxMeterStyle->addItem ( tr ( "Bar (narrow)" ) ); // MT_BAR_NARROW
cbxMeterStyle->addItem ( tr ( "Bar (wide)" ) ); // MT_BAR_WIDE
cbxMeterStyle->addItem ( tr ( "LEDs (stripe)" ) ); // MT_LED_STRIPE
cbxMeterStyle->addItem ( tr ( "LEDs (round, small)" ) ); // MT_LED_ROUND_SMALL
cbxMeterStyle->addItem ( tr ( "LEDs (round, big)" ) ); // MT_LED_ROUND_BIG
cbxMeterStyle->setCurrentIndex ( static_cast<int> ( pClient->GetMeterStyle() ) );

// language combo box (corrects the setting if language not found)
Expand Down
Loading