Merge pull request #2621 from henkdegroot/LED-naming

Make LED naming more consistent in the code
jamulussoftware · May 20, 2022 · bc2f246 · bc2f246
2 parents 9d8f07d + 7e75842
commit bc2f246
Show file tree

Hide file tree

Showing 38 changed files with 29 additions and 29 deletions.
diff --git a/src/levelmeter.cpp b/src/levelmeter.cpp
@@ -353,18 +353,18 @@ void CLevelMeter::ClipReset()
 }
 
 CLevelMeter::cLED::cLED ( QWidget* parent ) :
-    BitmCubeLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDBlackSmall.png" ) ),
-    BitmCubeLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDGreenSmall.png" ) ),
-    BitmCubeLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDYellowSmall.png" ) ),
-    BitmCubeLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDRedSmall.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" ) )
+    BitmCubeLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDBlack.png" ) ),
+    BitmCubeLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDGreen.png" ) ),
+    BitmCubeLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDYellow.png" ) ),
+    BitmCubeLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/HLEDRed.png" ) ),
+    BitmCubeRoundSmallLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDBlackSmall.png" ) ),
+    BitmCubeRoundSmallLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
+    BitmCubeRoundSmallLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ),
+    BitmCubeRoundSmallLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ),
+    BitmCubeRoundBigLedBlack ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDBlackBig.png" ) ),
+    BitmCubeRoundBigLedGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenBig.png" ) ),
+    BitmCubeRoundBigLedYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowBig.png" ) ),
+    BitmCubeRoundBigLedRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedBig.png" ) )
 {
     // create LED label
     pLEDLabel = new QLabel ( "", parent );

diff --git a/src/multicolorled.cpp b/src/multicolorled.cpp
@@ -30,9 +30,9 @@
 /* Implementation *************************************************************/
 CMultiColorLED::CMultiColorLED ( QWidget* parent ) :
     QLabel ( parent ),
-    BitmCubeDisabled ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDDisabledSmall.png" ) ),
-    BitmCubeGrey ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreySmall.png" ) ),
-    BitmCubeGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ),
+    BitmCubeDisabled ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDDisabled.png" ) ),
+    BitmCubeGrey ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGrey.png" ) ),
+    BitmCubeGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenBig.png" ) ),
     BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorYellowFancy.png" ) ),
     BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorRedFancy.png" ) ),
     BitmIndicatorGreen ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorGreen.png" ) ),

diff --git a/src/res/CLEDBlackBig.png b/src/res/CLEDBlackBig.png
diff --git a/src/res/CLEDBlackSmall.png b/src/res/CLEDBlackSmall.png
diff --git a/src/res/CLEDBlack.png → src/res/CLEDBlackSrc.png b/src/res/CLEDBlack.png → src/res/CLEDBlackSrc.png
diff --git a/src/res/CLEDDisabledSmall.png → src/res/CLEDDisabled.png b/src/res/CLEDDisabledSmall.png → src/res/CLEDDisabled.png
diff --git a/src/res/CLEDGreenBig.png b/src/res/CLEDGreenBig.png
diff --git a/src/res/CLEDGreenSmall.png b/src/res/CLEDGreenSmall.png
diff --git a/src/res/CLEDGreen.png → src/res/CLEDGreenSrc.png b/src/res/CLEDGreen.png → src/res/CLEDGreenSrc.png
diff --git a/src/res/CLEDGrey.png b/src/res/CLEDGrey.png
diff --git a/src/res/CLEDGreySmall.png b/src/res/CLEDGreySmall.png
diff --git a/src/res/CLEDGreySrc.png b/src/res/CLEDGreySrc.png
diff --git a/src/res/CLEDRedBig.png b/src/res/CLEDRedBig.png
diff --git a/src/res/CLEDRedSmall.png b/src/res/CLEDRedSmall.png
diff --git a/src/res/CLEDRed.png → src/res/CLEDRedSrc.png b/src/res/CLEDRed.png → src/res/CLEDRedSrc.png
diff --git a/src/res/CLEDYellowBig.png b/src/res/CLEDYellowBig.png
diff --git a/src/res/CLEDYellowSmall.png b/src/res/CLEDYellowSmall.png
diff --git a/src/res/CLEDYellow.png → src/res/CLEDYellowSrc.png b/src/res/CLEDYellow.png → src/res/CLEDYellowSrc.png
diff --git a/src/res/HLEDBlack.png b/src/res/HLEDBlack.png
diff --git a/src/res/HLEDBlackSmall.png b/src/res/HLEDBlackSmall.png
diff --git a/src/res/HLEDBlackSrc.png b/src/res/HLEDBlackSrc.png
diff --git a/src/res/HLEDGreen.png b/src/res/HLEDGreen.png
diff --git a/src/res/HLEDGreenSmall.png b/src/res/HLEDGreenSmall.png
diff --git a/src/res/HLEDGreenSrc.png b/src/res/HLEDGreenSrc.png
diff --git a/src/res/HLEDGrey.png b/src/res/HLEDGrey.png
diff --git a/src/res/HLEDGreySmall.png b/src/res/HLEDGreySmall.png
diff --git a/src/res/HLEDGreySrc.png b/src/res/HLEDGreySrc.png
diff --git a/src/res/HLEDRed.png b/src/res/HLEDRed.png
diff --git a/src/res/HLEDRedSmall.png b/src/res/HLEDRedSmall.png
diff --git a/src/res/HLEDRedSrc.png b/src/res/HLEDRedSrc.png
diff --git a/src/res/HLEDYellow.png b/src/res/HLEDYellow.png
diff --git a/src/res/HLEDYellowSmall.png b/src/res/HLEDYellowSmall.png
diff --git a/src/res/HLEDYellowSrc.png b/src/res/HLEDYellowSrc.png
diff --git a/src/res/LEDBlackSmall.png b/src/res/LEDBlackSmall.png
diff --git a/src/res/LEDGreenSmall.png b/src/res/LEDGreenSmall.png
diff --git a/src/res/LEDRedSmall.png b/src/res/LEDRedSmall.png
diff --git a/src/res/LEDYellowSmall.png b/src/res/LEDYellowSmall.png
diff --git a/src/resources.qrc b/src/resources.qrc
@@ -34,25 +34,25 @@
     </qresource>
 
     <qresource prefix="/png/LEDs">
-        <file>res/CLEDDisabledSmall.png</file>
-        <file>res/CLEDGreenSmall.png</file>
-        <file>res/CLEDGreySmall.png</file>
-        <file>res/CLEDRedSmall.png</file>
-        <file>res/CLEDYellowSmall.png</file>
-        <file>res/CLEDBlackSmall.png</file>
+        <file>res/CLEDDisabled.png</file>
+        <file>res/CLEDGrey.png</file>
+        <file>res/CLEDGreenBig.png</file>
+        <file>res/CLEDRedBig.png</file>
+        <file>res/CLEDYellowBig.png</file>
+        <file>res/CLEDBlackBig.png</file>
         <file>res/IndicatorGreen.png</file>
         <file>res/IndicatorYellow.png</file>
         <file>res/IndicatorRed.png</file>
-        <file>res/HLEDGreenSmall.png</file>
-        <file>res/HLEDBlackSmall.png</file>
-        <file>res/HLEDRedSmall.png</file>
-        <file>res/HLEDYellowSmall.png</file>
+        <file>res/HLEDGreen.png</file>
+        <file>res/HLEDBlack.png</file>
+        <file>res/HLEDRed.png</file>
+        <file>res/HLEDYellow.png</file>
         <file>res/IndicatorRedFancy.png</file>
         <file>res/IndicatorYellowFancy.png</file>
-        <file>res/LEDGreenSmall.png</file>
-        <file>res/LEDBlackSmall.png</file>
-        <file>res/LEDRedSmall.png</file>
-        <file>res/LEDYellowSmall.png</file>
+        <file>res/CLEDGreenSmall.png</file>
+        <file>res/CLEDBlackSmall.png</file>
+        <file>res/CLEDRedSmall.png</file>
+        <file>res/CLEDYellowSmall.png</file>
     </qresource>
     <qresource prefix="/png/fader">
         <file>res/faderbackground.png</file>