diff --git a/src/levelmeter.cpp b/src/levelmeter.cpp index fccafe44d5..39aac74e98 100644 --- 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 index 9c5c017899..43d63fd424 100644 --- 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 new file mode 100644 index 0000000000..83b148bdb5 Binary files /dev/null and b/src/res/CLEDBlackBig.png differ diff --git a/src/res/CLEDBlackSmall.png b/src/res/CLEDBlackSmall.png index 83b148bdb5..46a3ab9d35 100644 Binary files a/src/res/CLEDBlackSmall.png and b/src/res/CLEDBlackSmall.png differ diff --git a/src/res/CLEDBlack.png b/src/res/CLEDBlackSrc.png similarity index 100% rename from src/res/CLEDBlack.png rename to src/res/CLEDBlackSrc.png diff --git a/src/res/CLEDDisabledSmall.png b/src/res/CLEDDisabled.png similarity index 100% rename from src/res/CLEDDisabledSmall.png rename to src/res/CLEDDisabled.png diff --git a/src/res/CLEDGreenBig.png b/src/res/CLEDGreenBig.png new file mode 100644 index 0000000000..def8d5cdce Binary files /dev/null and b/src/res/CLEDGreenBig.png differ diff --git a/src/res/CLEDGreenSmall.png b/src/res/CLEDGreenSmall.png index def8d5cdce..591c29ce6c 100644 Binary files a/src/res/CLEDGreenSmall.png and b/src/res/CLEDGreenSmall.png differ diff --git a/src/res/CLEDGreen.png b/src/res/CLEDGreenSrc.png similarity index 100% rename from src/res/CLEDGreen.png rename to src/res/CLEDGreenSrc.png diff --git a/src/res/CLEDGrey.png b/src/res/CLEDGrey.png index b3f5d7b015..6616ae311b 100644 Binary files a/src/res/CLEDGrey.png and b/src/res/CLEDGrey.png differ diff --git a/src/res/CLEDGreySmall.png b/src/res/CLEDGreySmall.png deleted file mode 100644 index 6616ae311b..0000000000 Binary files a/src/res/CLEDGreySmall.png and /dev/null differ diff --git a/src/res/CLEDGreySrc.png b/src/res/CLEDGreySrc.png new file mode 100644 index 0000000000..b3f5d7b015 Binary files /dev/null and b/src/res/CLEDGreySrc.png differ diff --git a/src/res/CLEDRedBig.png b/src/res/CLEDRedBig.png new file mode 100644 index 0000000000..e46be68321 Binary files /dev/null and b/src/res/CLEDRedBig.png differ diff --git a/src/res/CLEDRedSmall.png b/src/res/CLEDRedSmall.png index e46be68321..787b13ea69 100644 Binary files a/src/res/CLEDRedSmall.png and b/src/res/CLEDRedSmall.png differ diff --git a/src/res/CLEDRed.png b/src/res/CLEDRedSrc.png similarity index 100% rename from src/res/CLEDRed.png rename to src/res/CLEDRedSrc.png diff --git a/src/res/CLEDYellowBig.png b/src/res/CLEDYellowBig.png new file mode 100644 index 0000000000..baabb128f5 Binary files /dev/null and b/src/res/CLEDYellowBig.png differ diff --git a/src/res/CLEDYellowSmall.png b/src/res/CLEDYellowSmall.png index baabb128f5..74df188ba2 100644 Binary files a/src/res/CLEDYellowSmall.png and b/src/res/CLEDYellowSmall.png differ diff --git a/src/res/CLEDYellow.png b/src/res/CLEDYellowSrc.png similarity index 100% rename from src/res/CLEDYellow.png rename to src/res/CLEDYellowSrc.png diff --git a/src/res/HLEDBlack.png b/src/res/HLEDBlack.png index a2b423b0f2..1ecfe9bd3b 100644 Binary files a/src/res/HLEDBlack.png and b/src/res/HLEDBlack.png differ diff --git a/src/res/HLEDBlackSmall.png b/src/res/HLEDBlackSmall.png deleted file mode 100644 index 1ecfe9bd3b..0000000000 Binary files a/src/res/HLEDBlackSmall.png and /dev/null differ diff --git a/src/res/HLEDBlackSrc.png b/src/res/HLEDBlackSrc.png new file mode 100644 index 0000000000..a2b423b0f2 Binary files /dev/null and b/src/res/HLEDBlackSrc.png differ diff --git a/src/res/HLEDGreen.png b/src/res/HLEDGreen.png index 2e395b919e..d94ef884fe 100644 Binary files a/src/res/HLEDGreen.png and b/src/res/HLEDGreen.png differ diff --git a/src/res/HLEDGreenSmall.png b/src/res/HLEDGreenSmall.png deleted file mode 100644 index d94ef884fe..0000000000 Binary files a/src/res/HLEDGreenSmall.png and /dev/null differ diff --git a/src/res/HLEDGreenSrc.png b/src/res/HLEDGreenSrc.png new file mode 100644 index 0000000000..2e395b919e Binary files /dev/null and b/src/res/HLEDGreenSrc.png differ diff --git a/src/res/HLEDGrey.png b/src/res/HLEDGrey.png index 8cafffbd1c..97d3d5787b 100644 Binary files a/src/res/HLEDGrey.png and b/src/res/HLEDGrey.png differ diff --git a/src/res/HLEDGreySmall.png b/src/res/HLEDGreySmall.png deleted file mode 100644 index 97d3d5787b..0000000000 Binary files a/src/res/HLEDGreySmall.png and /dev/null differ diff --git a/src/res/HLEDGreySrc.png b/src/res/HLEDGreySrc.png new file mode 100644 index 0000000000..8cafffbd1c Binary files /dev/null and b/src/res/HLEDGreySrc.png differ diff --git a/src/res/HLEDRed.png b/src/res/HLEDRed.png index 83e21598a3..a442bb0e4d 100644 Binary files a/src/res/HLEDRed.png and b/src/res/HLEDRed.png differ diff --git a/src/res/HLEDRedSmall.png b/src/res/HLEDRedSmall.png deleted file mode 100644 index a442bb0e4d..0000000000 Binary files a/src/res/HLEDRedSmall.png and /dev/null differ diff --git a/src/res/HLEDRedSrc.png b/src/res/HLEDRedSrc.png new file mode 100644 index 0000000000..83e21598a3 Binary files /dev/null and b/src/res/HLEDRedSrc.png differ diff --git a/src/res/HLEDYellow.png b/src/res/HLEDYellow.png index 12ac10b522..dfdb65477a 100644 Binary files a/src/res/HLEDYellow.png and b/src/res/HLEDYellow.png differ diff --git a/src/res/HLEDYellowSmall.png b/src/res/HLEDYellowSmall.png deleted file mode 100644 index dfdb65477a..0000000000 Binary files a/src/res/HLEDYellowSmall.png and /dev/null differ diff --git a/src/res/HLEDYellowSrc.png b/src/res/HLEDYellowSrc.png new file mode 100644 index 0000000000..12ac10b522 Binary files /dev/null and b/src/res/HLEDYellowSrc.png differ diff --git a/src/res/LEDBlackSmall.png b/src/res/LEDBlackSmall.png deleted file mode 100644 index 46a3ab9d35..0000000000 Binary files a/src/res/LEDBlackSmall.png and /dev/null differ diff --git a/src/res/LEDGreenSmall.png b/src/res/LEDGreenSmall.png deleted file mode 100644 index 591c29ce6c..0000000000 Binary files a/src/res/LEDGreenSmall.png and /dev/null differ diff --git a/src/res/LEDRedSmall.png b/src/res/LEDRedSmall.png deleted file mode 100644 index 787b13ea69..0000000000 Binary files a/src/res/LEDRedSmall.png and /dev/null differ diff --git a/src/res/LEDYellowSmall.png b/src/res/LEDYellowSmall.png deleted file mode 100644 index 74df188ba2..0000000000 Binary files a/src/res/LEDYellowSmall.png and /dev/null differ diff --git a/src/resources.qrc b/src/resources.qrc index 8d4fd7d3bf..7a1e45f82a 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -34,25 +34,25 @@ - res/CLEDDisabledSmall.png - res/CLEDGreenSmall.png - res/CLEDGreySmall.png - res/CLEDRedSmall.png - res/CLEDYellowSmall.png - res/CLEDBlackSmall.png + res/CLEDDisabled.png + res/CLEDGrey.png + res/CLEDGreenBig.png + res/CLEDRedBig.png + res/CLEDYellowBig.png + res/CLEDBlackBig.png res/IndicatorGreen.png res/IndicatorYellow.png res/IndicatorRed.png - res/HLEDGreenSmall.png - res/HLEDBlackSmall.png - res/HLEDRedSmall.png - res/HLEDYellowSmall.png + res/HLEDGreen.png + res/HLEDBlack.png + res/HLEDRed.png + res/HLEDYellow.png res/IndicatorRedFancy.png res/IndicatorYellowFancy.png - res/LEDGreenSmall.png - res/LEDBlackSmall.png - res/LEDRedSmall.png - res/LEDYellowSmall.png + res/CLEDGreenSmall.png + res/CLEDBlackSmall.png + res/CLEDRedSmall.png + res/CLEDYellowSmall.png res/faderbackground.png