From 20084f5d49e894352f1679e35590465140c1f8bc Mon Sep 17 00:00:00 2001 From: henkdegroot <13550012+henkdegroot@users.noreply.github.com> Date: Sun, 23 May 2021 23:00:28 +0200 Subject: [PATCH] left-side gui section update --- Jamulus.pro | 2 ++ src/clientdlgbase.ui | 38 ++++++++----------------------- src/multicolorled.cpp | 4 ++-- src/res/IndicatorRedFancy.png | Bin 0 -> 678 bytes src/res/IndicatorYellowFancy.png | Bin 0 -> 631 bytes src/resources.qrc | 2 ++ 6 files changed, 15 insertions(+), 31 deletions(-) create mode 100644 src/res/IndicatorRedFancy.png create mode 100644 src/res/IndicatorYellowFancy.png 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 0000000000000000000000000000000000000000..56154bc1f281564d53bb3b49c68ae31d363ff39c GIT binary patch literal 678 zcmV;X0$KfuP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vIQ7ytmK7y*8D$&CO20y{}WK~y+TRg%AN zQc)DgzmMO2FaXbI0yZxYho+$E=whl?+c04IVq6S$?b3z0CQkhWy6DigC0!cx2n-|| z2C0LEI;h136H2O2MFaypMIT(xebA~W`6lO{dp_sfA4kAHrfHhY7)z5>TE@mvR0ToM zNSmsvHYYKhfw^2RMZnf@I27CMHU@)%6?ePc2nK_&+wBIytI1?C!{ZiMC=@uf(`vOa zU9aO(C=9!m zp1TbFc?mCE4g>-L!)CKZY;=S)IihlKfN*>cn7#l+qQGI5^mgo1EHoR3Qm%mKT8z`_ zRC~Q1VwDQ;@G-Feik@W#Sh!AF0OI7A4uSPYn5~py7zQ|la=Fa1*{pRi=DW$5UuEpc zK3#cYdnLv^w;6NHTRHiBo^ghEgv;gPmj-&&wWkBaU*k15_8Txik*F&f&*cmUt3IC( z{p2#>@Bq8(z}*|bUSTZm?>?YC5&h*m;JKV}kZF=6#ZH!%Fq2xN#6<#%z`YHt1NER7 z6*Z^uv2$#F2|bV|)M_=EoO-w06_t0#@UwHkeR?EwIOZJm9ouX8ZvTdpSQK8b*P!o< zSOd^#G*UDbJN4BY4{7C@&m2wDw=LVri@)SAtvOmLd?-;fiakv3&no(wtg2P!c4HOl2a9{>OV M07*qoM6N<$f{P0#j{pDw literal 0 HcmV?d00001 diff --git a/src/res/IndicatorYellowFancy.png b/src/res/IndicatorYellowFancy.png new file mode 100644 index 0000000000000000000000000000000000000000..25d5fb6897e1608352d79574fe754c50601afcb4 GIT binary patch literal 631 zcmV--0*L*IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vIQ7ytmK7y*8D$&CO20t`t+K~y+Tb&^47 zQgIx|zfXO-sT7)TB8luY*4AJ|(6Orr35n{mb=@tnYY=p(&b!2D*XAi2itpehqeBq7 z4vjJ#4wg{DL?nDZC#kRR@9(k|^o1|{-tYhY{NMlm-%rCC<#IX0ahwdD=Ht?&i>jt+ zIeIglPPa~bn1Y2uVU57{Xf*P7IvorK1J(EWd(AE)xyHUU9Ra8IHR99 zICz2m{c{L~Lbl80ns@OC85aI{yiDjeL;pe|oolxczgUK36{G8V+OjMxFYhtnr3Wz0 zT^L40*)(6V*QY(Wv{Z&|+YknoO2x_N^ZZ26FX?wqBy!$iQdw%pc}r(i#xzYw7S-dW-_WwgGchZSfYo3y2+O*`_DA|5wzgu3M7*@lI?CQ7`U{VF2a**= ztJP{x`0pNQ+G{K>-echZIy`)i;qba#&{M5muNy3my4|in8r?-S`izn3CrVza)w+-4 ztb+}wN2&Q=w0a?HZ Ri+2D3002ovPDHLkV1jf8Ezke} literal 0 HcmV?d00001 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