From 3117acde7bdbbd4cc6eebc9619214a79737b54f5 Mon Sep 17 00:00:00 2001
From: henkdegroot <13550012+henkdegroot@users.noreply.github.com>
Date: Mon, 7 Feb 2022 20:58:19 +0100
Subject: [PATCH] Improve Meterstyle Naming
---
src/audiomixerboard.cpp | 26 ++++----
src/client.cpp | 2 +-
src/clientdlg.cpp | 30 +++++-----
src/clientsettingsdlg.cpp | 16 ++---
src/levelmeter.cpp | 122 +++++++++++++++++++-------------------
src/levelmeter.h | 42 ++++++-------
src/settings.cpp | 10 ++--
src/util.h | 10 ++--
8 files changed, 129 insertions(+), 129 deletions(-)
diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
index 5cecd698ac..e6ebaf45ff 100644
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@@ -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;
diff --git a/src/client.cpp b/src/client.cpp
index 339e7acfe6..203b1a0f36 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -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 ),
diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
index 148870c860..e71ae32e63 100644
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@@ -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;
}
diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
index 7ecb612ddd..4eeb482461 100644
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@@ -269,9 +269,9 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
// MeterStyle
lblMeterStyle->setWhatsThis ( "" + tr ( "Meter Style" ) + ": " +
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" ) );
@@ -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 ( pClient->GetMeterStyle() ) );
// language combo box (corrects the setting if language not found)
diff --git a/src/levelmeter.cpp b/src/levelmeter.cpp
index 8bce2b9066..9eb126fe94 100644
--- a/src/levelmeter.cpp
+++ b/src/levelmeter.cpp
@@ -28,7 +28,7 @@
#include "levelmeter.h"
/* Implementation *************************************************************/
-CLevelMeter::CLevelMeter ( QWidget* parent ) : QWidget ( parent ), eLevelMeterType ( MT_BAR )
+CLevelMeter::CLevelMeter ( QWidget* parent ) : QWidget ( parent ), eLevelMeterType ( MT_BAR_WIDE )
{
// initialize LED meter
QWidget* pLEDMeter = new QWidget();
@@ -97,7 +97,7 @@ void CLevelMeter::SetLevelMeterType ( const ELevelMeterType eNType )
switch ( eNType )
{
- case MT_LED:
+ case MT_LED_STRIPE:
// initialize all LEDs
for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
{
@@ -106,26 +106,26 @@ void CLevelMeter::SetLevelMeterType ( const ELevelMeterType eNType )
pMinStackedLayout->setCurrentIndex ( 0 );
break;
- case MT_SLIM_LED:
+ case MT_LED_ROUND_BIG:
// initialize all LEDs
for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
{
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SLIM_BLACK );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_BLACK );
}
pMinStackedLayout->setCurrentIndex ( 0 );
break;
- case MT_SMALL_LED:
+ case MT_LED_ROUND_SMALL:
// initialize all LEDs
for ( int iLEDIdx = 0; iLEDIdx < NUM_LEDS_INCL_CLIP_LED; iLEDIdx++ )
{
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SMALL_BLACK );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_BLACK );
}
pMinStackedLayout->setCurrentIndex ( 0 );
break;
- case MT_BAR:
- case MT_SLIM_BAR:
+ case MT_BAR_WIDE:
+ case MT_BAR_NARROW:
pMinStackedLayout->setCurrentIndex ( 1 );
break;
}
@@ -138,7 +138,7 @@ void CLevelMeter::SetBarMeterStyleAndClipStatus ( const ELevelMeterType eNType,
{
switch ( eNType )
{
- case MT_SLIM_BAR:
+ case MT_BAR_NARROW:
if ( bIsClip )
{
pBarMeter->setStyleSheet ( "QProgressBar { border: 0px solid red;"
@@ -158,7 +158,7 @@ void CLevelMeter::SetBarMeterStyleAndClipStatus ( const ELevelMeterType eNType,
}
break;
- default: /* MT_BAR */
+ default: /* MT_BAR_WIDE */
if ( bIsClip )
{
pBarMeter->setStyleSheet ( "QProgressBar { border: 2px solid red;"
@@ -183,7 +183,7 @@ void CLevelMeter::SetValue ( const double dValue )
{
switch ( eLevelMeterType )
{
- case MT_LED:
+ case MT_LED_STRIPE:
// update state of all LEDs for current level value (except of the clip LED)
for ( int iLEDIdx = 0; iLEDIdx < NUM_STEPS_LED_BAR; iLEDIdx++ )
{
@@ -218,7 +218,7 @@ void CLevelMeter::SetValue ( const double dValue )
}
break;
- case MT_SLIM_LED:
+ case MT_LED_ROUND_BIG:
// update state of all LEDs for current level value (except of the clip LED)
for ( int iLEDIdx = 0; iLEDIdx < NUM_STEPS_LED_BAR; iLEDIdx++ )
{
@@ -229,31 +229,31 @@ void CLevelMeter::SetValue ( const double dValue )
if ( iLEDIdx < YELLOW_BOUND_LED_BAR )
{
// green region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SLIM_GREEN );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_GREEN );
}
else
{
if ( iLEDIdx < RED_BOUND_LED_BAR )
{
// yellow region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SLIM_YELLOW );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_YELLOW );
}
else
{
// red region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SLIM_RED );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_RED );
}
}
}
else
{
// we use black LED for inactive state
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SLIM_BLACK );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_BIG_BLACK );
}
}
break;
- case MT_SMALL_LED:
+ case MT_LED_ROUND_SMALL:
// update state of all LEDs for current level value (except of the clip LED)
for ( int iLEDIdx = 0; iLEDIdx < NUM_STEPS_LED_BAR; iLEDIdx++ )
{
@@ -264,32 +264,32 @@ void CLevelMeter::SetValue ( const double dValue )
if ( iLEDIdx < YELLOW_BOUND_LED_BAR )
{
// green region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SMALL_GREEN );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_GREEN );
}
else
{
if ( iLEDIdx < RED_BOUND_LED_BAR )
{
// yellow region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SMALL_YELLOW );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_YELLOW );
}
else
{
// red region
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SMALL_RED );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_RED );
}
}
}
else
{
// we use black LED for inactive state
- vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_SMALL_BLACK );
+ vecpLEDs[iLEDIdx]->SetColor ( cLED::RL_ROUND_SMALL_BLACK );
}
}
break;
- case MT_BAR:
- case MT_SLIM_BAR:
+ case MT_BAR_WIDE:
+ case MT_BAR_NARROW:
pBarMeter->setValue ( 100 * dValue );
break;
}
@@ -303,20 +303,20 @@ void CLevelMeter::SetValue ( const double dValue )
{
switch ( eLevelMeterType )
{
- case MT_LED:
+ case MT_LED_STRIPE:
vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_RED );
break;
- case MT_SLIM_LED:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_SLIM_RED );
+ case MT_LED_ROUND_BIG:
+ vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_BIG_RED );
break;
- case MT_SMALL_LED:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_SMALL_RED );
+ case MT_LED_ROUND_SMALL:
+ vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_SMALL_RED );
break;
- case MT_BAR:
- case MT_SLIM_BAR:
+ case MT_BAR_WIDE:
+ case MT_BAR_NARROW:
SetBarMeterStyleAndClipStatus ( eLevelMeterType, true );
break;
}
@@ -333,20 +333,20 @@ void CLevelMeter::ClipReset()
switch ( eLevelMeterType )
{
- case MT_LED:
+ case MT_LED_STRIPE:
vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_BLACK );
break;
- case MT_SLIM_LED:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_SLIM_BLACK );
+ case MT_LED_ROUND_BIG:
+ vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_BIG_BLACK );
break;
- case MT_SMALL_LED:
- vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_SMALL_BLACK );
+ case MT_LED_ROUND_SMALL:
+ vecpLEDs[NUM_STEPS_LED_BAR]->SetColor ( cLED::RL_ROUND_SMALL_BLACK );
break;
- case MT_BAR:
- case MT_SLIM_BAR:
+ case MT_BAR_WIDE:
+ case MT_BAR_NARROW:
SetBarMeterStyleAndClipStatus ( eLevelMeterType, false );
break;
}
@@ -357,14 +357,14 @@ CLevelMeter::cLED::cLED ( QWidget* parent ) :
BitmCubeLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDGreenSmall.png" ) ),
BitmCubeLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDYellowSmall.png" ) ),
BitmCubeLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDRedSmall.png" ) ),
- BitmCubeSlimLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDBlackSmall.png" ) ),
- BitmCubeSlimLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
- BitmCubeSlimLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ),
- BitmCubeSlimLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ),
- BitmCubeSmallLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/LEDBlackSmall.png" ) ),
- BitmCubeSmallLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/LEDGreenSmall.png" ) ),
- BitmCubeSmallLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/LEDYellowSmall.png" ) ),
- BitmCubeSmallLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/LEDRedSmall.png" ) )
+ BitmCubeRoundSmallLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/LEDBlackSmall.png" ) ),
+ BitmCubeRoundSmallLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/LEDGreenSmall.png" ) ),
+ BitmCubeRoundSmallLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/LEDYellowSmall.png" ) ),
+ BitmCubeRoundSmallLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/LEDRedSmall.png" ) ),
+ BitmCubeRoundBigLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDBlackSmall.png" ) ),
+ BitmCubeRoundBigLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
+ BitmCubeRoundBigLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ),
+ BitmCubeRoundBigLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) )
{
// create LED label
pLEDLabel = new QLabel ( "", parent );
@@ -402,36 +402,36 @@ void CLevelMeter::cLED::SetColor ( const ELightColor eNewColor )
pLEDLabel->setPixmap ( BitmCubeLedRed );
break;
- case RL_SLIM_BLACK:
- pLEDLabel->setPixmap ( BitmCubeSlimLedBlack );
+ case RL_ROUND_SMALL_BLACK:
+ pLEDLabel->setPixmap ( BitmCubeRoundSmallLedBlack );
break;
- case RL_SLIM_GREEN:
- pLEDLabel->setPixmap ( BitmCubeSlimLedGreen );
+ case RL_ROUND_SMALL_GREEN:
+ pLEDLabel->setPixmap ( BitmCubeRoundSmallLedGreen );
break;
- case RL_SLIM_YELLOW:
- pLEDLabel->setPixmap ( BitmCubeSlimLedYellow );
+ case RL_ROUND_SMALL_YELLOW:
+ pLEDLabel->setPixmap ( BitmCubeRoundSmallLedYellow );
break;
- case RL_SLIM_RED:
- pLEDLabel->setPixmap ( BitmCubeSlimLedRed );
+ case RL_ROUND_SMALL_RED:
+ pLEDLabel->setPixmap ( BitmCubeRoundSmallLedRed );
break;
- case RL_SMALL_BLACK:
- pLEDLabel->setPixmap ( BitmCubeSmallLedBlack );
+ case RL_ROUND_BIG_BLACK:
+ pLEDLabel->setPixmap ( BitmCubeRoundBigLedBlack );
break;
- case RL_SMALL_GREEN:
- pLEDLabel->setPixmap ( BitmCubeSmallLedGreen );
+ case RL_ROUND_BIG_GREEN:
+ pLEDLabel->setPixmap ( BitmCubeRoundBigLedGreen );
break;
- case RL_SMALL_YELLOW:
- pLEDLabel->setPixmap ( BitmCubeSmallLedYellow );
+ case RL_ROUND_BIG_YELLOW:
+ pLEDLabel->setPixmap ( BitmCubeRoundBigLedYellow );
break;
- case RL_SMALL_RED:
- pLEDLabel->setPixmap ( BitmCubeSmallLedRed );
+ case RL_ROUND_BIG_RED:
+ pLEDLabel->setPixmap ( BitmCubeRoundBigLedRed );
break;
}
eCurLightColor = eNewColor;
diff --git a/src/levelmeter.h b/src/levelmeter.h
index 545f60adba..6d702c8495 100644
--- a/src/levelmeter.h
+++ b/src/levelmeter.h
@@ -44,11 +44,11 @@ class CLevelMeter : public QWidget
public:
enum ELevelMeterType
{
- MT_LED,
- MT_BAR,
- MT_SLIM_BAR,
- MT_SLIM_LED,
- MT_SMALL_LED
+ MT_BAR_NARROW,
+ MT_BAR_WIDE,
+ MT_LED_STRIPE,
+ MT_LED_ROUND_SMALL,
+ MT_LED_ROUND_BIG
};
CLevelMeter ( QWidget* parent = nullptr );
@@ -68,14 +68,14 @@ class CLevelMeter : public QWidget
RL_GREEN,
RL_YELLOW,
RL_RED,
- RL_SLIM_BLACK,
- RL_SLIM_GREEN,
- RL_SLIM_YELLOW,
- RL_SLIM_RED,
- RL_SMALL_BLACK,
- RL_SMALL_GREEN,
- RL_SMALL_YELLOW,
- RL_SMALL_RED
+ RL_ROUND_SMALL_BLACK,
+ RL_ROUND_SMALL_GREEN,
+ RL_ROUND_SMALL_YELLOW,
+ RL_ROUND_SMALL_RED,
+ RL_ROUND_BIG_BLACK,
+ RL_ROUND_BIG_GREEN,
+ RL_ROUND_BIG_YELLOW,
+ RL_ROUND_BIG_RED
};
cLED ( QWidget* parent );
@@ -89,14 +89,14 @@ class CLevelMeter : public QWidget
QPixmap BitmCubeLedGreen;
QPixmap BitmCubeLedYellow;
QPixmap BitmCubeLedRed;
- QPixmap BitmCubeSlimLedBlack;
- QPixmap BitmCubeSlimLedGreen;
- QPixmap BitmCubeSlimLedYellow;
- QPixmap BitmCubeSlimLedRed;
- QPixmap BitmCubeSmallLedBlack;
- QPixmap BitmCubeSmallLedGreen;
- QPixmap BitmCubeSmallLedYellow;
- QPixmap BitmCubeSmallLedRed;
+ QPixmap BitmCubeRoundSmallLedBlack;
+ QPixmap BitmCubeRoundSmallLedGreen;
+ QPixmap BitmCubeRoundSmallLedYellow;
+ QPixmap BitmCubeRoundSmallLedRed;
+ QPixmap BitmCubeRoundBigLedBlack;
+ QPixmap BitmCubeRoundBigLedGreen;
+ QPixmap BitmCubeRoundBigLedYellow;
+ QPixmap BitmCubeRoundBigLedRed;
ELightColor eCurLightColor;
QLabel* pLEDLabel;
diff --git a/src/settings.cpp b/src/settings.cpp
index 4e906e15b8..eb8884a9f5 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -412,7 +412,7 @@ void CClientSettings::ReadSettingsFromXML ( const QDomDocument& IniXMLDocument,
}
// MeterStyle
- if ( GetNumericIniSet ( IniXMLDocument, "client", "meterstyle", 0, 4 /* MT_SMALL_LED */, iValue ) )
+ if ( GetNumericIniSet ( IniXMLDocument, "client", "meterstyle", 0, 4 /* MT_LED_ROUND_BIG */, iValue ) )
{
pClient->SetMeterStyle ( static_cast ( iValue ) );
}
@@ -424,19 +424,19 @@ void CClientSettings::ReadSettingsFromXML ( const QDomDocument& IniXMLDocument,
switch ( iValue )
{
case GD_STANDARD:
- pClient->SetMeterStyle ( MT_BAR );
+ pClient->SetMeterStyle ( MT_BAR_WIDE );
break;
case GD_ORIGINAL:
- pClient->SetMeterStyle ( MT_LED );
+ pClient->SetMeterStyle ( MT_LED_STRIPE );
break;
case GD_SLIMFADER:
- pClient->SetMeterStyle ( MT_SLIM_BAR );
+ pClient->SetMeterStyle ( MT_BAR_NARROW );
break;
default:
- pClient->SetMeterStyle ( MT_LED );
+ pClient->SetMeterStyle ( MT_LED_STRIPE );
break;
}
}
diff --git a/src/util.h b/src/util.h
index 09feef17ab..c504af7a1a 100644
--- a/src/util.h
+++ b/src/util.h
@@ -518,11 +518,11 @@ enum EGUIDesign
enum EMeterStyle
{
// used for settings -> enum values should be fixed
- MT_LED = 0,
- MT_BAR = 1,
- MT_SLIM_BAR = 2,
- MT_SLIM_LED = 3,
- MT_SMALL_LED = 4
+ MT_BAR_NARROW = 0,
+ MT_BAR_WIDE = 1,
+ MT_LED_STRIPE = 2,
+ MT_LED_ROUND_SMALL = 3,
+ MT_LED_ROUND_BIG = 4
};
// Server licence type enum ----------------------------------------------------