diff --git a/Jamulus.pro b/Jamulus.pro index 39ce276416..13a53f038d 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -732,6 +732,8 @@ DISTFILES += ChangeLog \ src/res/IndicatorGreen.png \ src/res/IndicatorYellow.png \ src/res/IndicatorRed.png \ + src/res/IndicatorYellowFancy.png \ + src/res/IndicatorRedFancy.png \ src/res/faderbackground.png \ src/res/faderhandle.png \ src/res/faderhandlesmall.png \ diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index 63d7f7062b..7afdf70777 100644 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -65,19 +65,6 @@ 3 - - - - Qt::Vertical - - - - 20 - 10 - - - - @@ -115,7 +102,7 @@ - 3 + 6 @@ -147,6 +134,12 @@ + + + 0 + 0 + + 0 @@ -215,7 +208,7 @@ 10 - 0 + 10 @@ -270,7 +263,7 @@ 10 - 5 + 3 @@ -314,19 +307,6 @@ - - - - Qt::Vertical - - - - 10 - 0 - - - - diff --git a/src/multicolorled.cpp b/src/multicolorled.cpp index 2d21fb0270..aad3c4b090 100644 --- a/src/multicolorled.cpp +++ b/src/multicolorled.cpp @@ -33,8 +33,8 @@ CMultiColorLED::CMultiColorLED ( QWidget* 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" ) ), - BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ), - BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.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" ) ), BitmIndicatorYellow ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorYellow.png" ) ), BitmIndicatorRed ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorRed.png" ) ) diff --git a/src/res/IndicatorRedFancy.png b/src/res/IndicatorRedFancy.png new file mode 100644 index 0000000000..56154bc1f2 Binary files /dev/null and b/src/res/IndicatorRedFancy.png differ diff --git a/src/res/IndicatorYellowFancy.png b/src/res/IndicatorYellowFancy.png new file mode 100644 index 0000000000..25d5fb6897 Binary files /dev/null and b/src/res/IndicatorYellowFancy.png differ diff --git a/src/resources.qrc b/src/resources.qrc index bbc1d6f5ad..f792e664a2 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -41,6 +41,8 @@ res/IndicatorGreen.png res/IndicatorYellow.png res/IndicatorRed.png + res/IndicatorYellowFancy.png + res/IndicatorRedFancy.png res/HLEDGreenSmall.png res/HLEDBlackSmall.png res/HLEDRedSmall.png