From 07dcea129440d6f34029f0fd5aa82830d9502d45 Mon Sep 17 00:00:00 2001 From: Lost Robot <34612565+DouglasDGI@users.noreply.github.com> Date: Sat, 13 Apr 2019 14:26:41 -0600 Subject: [PATCH 1/2] Replace Monstro icons --- plugins/monstro/exp.png | Bin 522 -> 539 bytes plugins/monstro/moog.png | Bin 599 -> 498 bytes plugins/monstro/noise.png | Bin 563 -> 711 bytes plugins/monstro/ramp.png | Bin 520 -> 443 bytes plugins/monstro/saw.png | Bin 529 -> 489 bytes plugins/monstro/sin.png | Bin 578 -> 596 bytes plugins/monstro/sinabs.png | Bin 468 -> 530 bytes plugins/monstro/sqr.png | Bin 427 -> 345 bytes plugins/monstro/sqrsoft.png | Bin 539 -> 453 bytes plugins/monstro/tri.png | Bin 602 -> 566 bytes 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/plugins/monstro/exp.png b/plugins/monstro/exp.png index 9fe634881a8d4c47b380b1963604c840b40a623f..acb7a55cbc2671ed17d4cb0e8ae080028f1160a2 100644 GIT binary patch literal 539 zcmV+$0_6RPP)AHt5#EFVf5n0=;+-!GkA{9z&r^f&L9)_o9nLkQOoK2y##( z1Vt#AKgRbU2x^Bdx9^?~wb*2neW~a4Ja3-Y^M2srf&U(=VsARt(VTO3Rhwxi-pL)r z5q!XaXV~EH1rU(L8z<-q1~b^mdV6ZuJ;9dftwvrEU(^%qDzU$VdWd^-R;HTD`(4BK zhf*5Du&NXRq|VH}*Lwq9!5T1gzfbMHRMmGFEcaUfLOWPmT(hM##$*7><@0DL7>d=^ zS_j}lZs#8i?sjxm%X$n@N1tp@#*3fEhc-Z00o2d))Xs5#TiDJz&qOti%J)zv{IsF_ zrS=Hbf{2clPpWHUua5d!*0yubBCw2#i{&Qs$s1eE4vCLW#H#CiL1I8&+@BA((l__b z-K?_&ECaZvI(r!e_>v4CUT9?+)dFCigP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DAIL_t(2&z+DzOI%SD#D8<| zeJ<>3wDB3N6wIa(QdPH-TTJE z^$)T(p5}0dGiTEmyj!;+TFXJ8AskT{N!uQ?NdWx*EaZ!S6L{NXC)%ohUhF{_9sW9@ZOo^U_>c$u2(B@Z5$C`T4R%`vy>Ey7Zx!@tunX)U&Ly(Jw{hTwGnzPHT>t<8 M07*qoM6N<$g8hfkK>z>% diff --git a/plugins/monstro/moog.png b/plugins/monstro/moog.png index 6d9005966f448c6da2cd4003fc4f06d6c4e2af7e..f206bd0da044290a77383c72779c5c414d340b26 100644 GIT binary patch literal 498 zcmVpP^PU6$`RsJX4)30IxMk)iSo}_+Rp#>oM>FLm6{cI| zEt|tfcU>5gUc+0$&)w}Qg&r^1RXda}Mu6x~`*3YmztzxHss9NMW{N8!I;Q9iIKPKO zXAc3(ND@HaH1;QLwW=wQPE_`Dk-)*PVLMZr6e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00F;AL_t(2&vnp0Z;f#j2k_5% zp66cGmXHvGGWZk!a;Hi}B0|C-NJR7%SWFVH0PlcJ;vKk46Tx6022)KmmZk>8U_i80 zz4!SYLxl>y<4Haz-*dv6OwMGze$1veTn{ei>iBM5x!LUXX*oj?lx7aj7SHh z(O@akt1O0F*DU{qrurhj>t;F~VNZr{nHEuoU8(;MG(RPhb-@8_305L3XDAl^kp|qz zXy!E0+KnC}`Ho?vIl7LXYf9FhxTX9+KB4o)Ee}0t7;{TCdXs-o|!CeB@cq_5iZsP`8#3?<)KYSFKc8*)#)0SPN0{}C?3VQ#dQllDegpgfD0vEEnjUs zGpDXfIwwrxW$>(!&dUAW?-IgKdX)OSb-TwtSF*0)jqY*$<>f`z1&c8z9qs2?r=R~#` z*NCM-T32K4yF1waY^tVf`179MAj!ueY|%_Jre!E6y=yU5|7!JAvIwJ&Yi zPv_S`9MW%Q*WxdV^#C2CvquH4Bi0Cj*f#)ty)4SE@|$P{(l$~|i_i_=MS~uIk_2}E z)bv0oOQ!)Wa2>1fJp46?M67>Jlk~J@KORz*G=NpYdFMY&p5Q9|$mN-D3-n8YM-ST3~V zMKzfz91*i5CWVPq(|}Wduu8#GOukn9>r!Dn)wDmC+Utu-uH5W89ZR*mcVfL*&sp~4`6~#bT&^`1}v}zfB=p9025uYC+j9q85B5{JKda5WM+PrdoYVg zrN=8;TJYG0V$n^>&UE002ovPDHLkV1i(}F8Tlf literal 563 zcmV-30?hr1P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00EmxL_t(2&ppw-Zd_Fq#qr-h z_s$IC4>^`i5vAb;Kp;^eA)&kjrCS;v$&V7cbdgY`G?9|HM8L=b#t?h%$DB=vJOfBeT2UBN~TNnQpK?1$)9hnzWb275_};Yp(fi%r>Zk_ z5+Q^iYUj;d{9$t43l~^o2)Fdh=n1z>t%`#}?Bzd5aLS{%riF1B#Zfaf$kjuajkYAo! zl$xTDRH@+Z7pm`*nO9mdC$RY&0|TRsr;B5V#`&Y?>^+zgWsZG(|9hTUYIdXE*<9D_ zj)EzNc^xNT2{UnxHVKQiaEms%m6cq7K+%U^$-pUUQK03N7BfZD_kXuu`8Ut|{5Kx? zABXnmZo70t;_9mu1 z=B)fk_mCwmvE~`EQOOOrvVPrinb?0J^w6~E+}OzEhA6Y*{I*BTvaFWdFYTLIJ#C5T zKi!Hq*0u5(8mifT+he14{GPMn5X0A_FMnMRsA(}@8aeUG0+Zs~GdCS#Sby`&?w6hY iC%T0`9t&<3I>2w`k#~xF+qZU57<#(;xvX6vrPa102y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00D4GL_t(2&vnwhOVx1{$MM(s z-m8fZA+=^xL+DrzZmprAi|x@=5R_|6YXlNS1pNyxMx_u$e}QdMLtD@iSw8E1_?-s5 zSb6W6&zsLV?{i}6b1p`>1=6dmJZ|jUT)P@=J*q_bj>M=i8O2buPfcd@gs_7j*pwzS z+#MY@a{a3s-NAx(rUo{J4QaY{=*D)#(8RjZ4J;5LlWn|@5LrB^in;S=40i*I`3w0b!xpGJ7rzUi;`YXGMo&TeJ6ssos15p(EJ@!mQ_6|a(&K)) zv1_ld?ll%2>AT-C+8tVAeO&eP&`zl=Cr^)6Ei_wZdnFN(>l3Pxe!ErWO{RAl#)6x@ zp(8R^FKM^-Y^i%5e86-;1MSW`WnDEfFaJ(lyQ0-7er0%qhkpP>51QPMrc!7C0000< KMNUMnLSTYBVbo0k diff --git a/plugins/monstro/saw.png b/plugins/monstro/saw.png index 56c077f2c529fea4f55046656dcc36e66c5bc71c..3122b082f8dbabcfde52d71584a8ec3712f45fab 100644 GIT binary patch literal 489 zcmVfBv=d#2GYbp#6Tn_i9sSUh{PaeqDe{G zPA?S$yU+AtHM{p15MQmnXK}Z4@A)O?o^yczI`kLRc5oR9)gU5*!mh)srf_X24FEC- zv@cF&1z_l-I z=ZgKPLYkPu(0a>_*AIMtFN>r3+d+W#0RYVFZlZDYdrnDgXCKB4mOB6dg;h7+Fi|S+ z2ae|MCP8`=0HCqxI_7k_>cm%AoH1amy@j)G!kqi9C*tFe#d!m?0sxvZ<@T6Ml_ntp zAeO&h7R<@l=3u-KH#hvuU&gYJLxNQj0JKuW1;^Ue zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DVPL_t(2&xMh_YE)qmhM#xN zmo;XSxL|9nEF=pyA&8x=Bq3?yB?tV$LR*<;hlL#{HJE#xo8~cgo0a$D*$mMVXHqvp`eMF1zLcQfUHX&C|cu8 zSX{%*0zZH+=`f((A-W~aEEW)Rh|OU*WgG^aJjQqqmK@xa5b(;-mGHi#i*M0DjP)xP zB~}DD^H70g&RhSAxNW7=GzM^1unbHA>nT{r?4sdVs++p-nY7!ZMR3(-UgEI}?)NKp zLgc@rQ8$&lOlET(Sdw@_<`E^|M@OmZ3q{>j1Pj1C=96Ky7-QqqH093L-n*l2N^k=( zaCao}baR{DpMEbinP~Pa7J(H&hI^5D^7R*6ooOLs>jclXBZ4a53XdhCh^STbs2nnKSNbdXfNZB8)TbOVgT?P^azou T!DIAa00000NkvXXu0mjfI`-7i diff --git a/plugins/monstro/sin.png b/plugins/monstro/sin.png index acabd5a171a9fc5ccefec61c360de9c09629563b..3ac3c9afa238aec201672993437ba6406c79a551 100644 GIT binary patch literal 596 zcmV-a0;~OrP)6+beFTQ+BPvC_e&4mI^- zv>??WeWODZ#DZgo4k9r|$# z=jH$~dvB)I#@Uf-8tedc*TxN;n=>#oz92Gz%iNhGY#2lq|_p!)b#rSKLYu&w(5B62zv_V{A=y#7aAu8h4ibX!Dk5EtRC4E3 zew9|rhZo`(e8-vq1Tq%aPu9bG7!RfvTh|=GN_q6dKP_ck1e@!D1K~iFj{oYC{}GWL_4#}|6<$75tf5-Nqyz4fi0o6e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00F8=L_t(2&u!65i;V#o2k_tX zzVA7VTP~e(X`(EI5xHcc>{y76Vj~~H);GY1VK1|h`$FV4LXk`oGiB1rQiZAR{9SdCIrJ=`DtfA^hyo6WkenX*~z6=7S1)tUAL6T*{X z`L}zsGDjM**bC#y?qEkQ9_+_TG)Fa1;~l&7|ZWTwZ_xSf6dzs?7?(f_%- QUjP6A07*qoM6N<$f=v?tU;qFB diff --git a/plugins/monstro/sinabs.png b/plugins/monstro/sinabs.png index 2216224e69d09e64184be0033f77821712ea0c58..e28d1ec21d4a3b3ef6ed2c7e26f5acbfdc9220ac 100644 GIT binary patch literal 530 zcmV+t0`2{YP)Wzp=8_llFDr zOHHrePhI|e>J8xfi-Swy!r=n$RRE+NDbyO%rCNDo?yWb5F+rVQVU)vhN>=8haCK{E(V2afYJeZyU z$gTSB*3fN0l(PUdo>f``G-pJ6F{t!r7V+o2>ou{99#xyOkLRyu!|}7 zE*tTbbf}eo@3e@wmElbh{37MC04d&VzhvKAjsDDg_w1Y`47f*D z1aMi~;~@Lm+Q(tuC*oK3OVsa@6#x{sPxeSJ0W1mY{ENx@mr?$Ma((|H=bR<}0-%(L UDvD>tcK`qY07*qoM6N<$g6{q6e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BHnL_t(2&+W{=YEy9-fZ^vm z`I(p@LQ}y%xC&MfD+LEZbP)%q&h}CqI&|)R=p6_SwnOcp1dDXlEZSzULnTd4a?a(49qBkbTornl0zupQw!MwwpqTA$A^TvTPKUl*GZcCn7{II8I2 z=x?t_*sY7rGSn}nb|u-u!(=Zw5q2_c;SOFWli-Q;vTD35$&2I$zTizF(!Jz%aGYTu zlGWg*#1(WFb+J=b6DFUZ$$G1qSF%ecW zT`R#V&N7{-)EX70`R6{>T4YBXtsl}^gsYV_&$J&L^cu5X*GxE!@Jl%Cb89rc7 zTEyey9Jr+IPc7=7mYz~R>7MtL!Q67Wq4u8cP^m8~^QH9PKllx$f`URePxCGS0000< KMNUMnLSTYeH^UwP diff --git a/plugins/monstro/sqr.png b/plugins/monstro/sqr.png index 83d5e4869038b5d02b01cf876afb598e62036928..d5d3c211c6e109e02863df08a81c1f60ac721135 100644 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^{6H+o!3HFmxV|j}Qfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#F$*sPy9i(De{GT_i(`nz>Er|njRP5VFDBY6x~ji@VwNPFp7`gm z(*OCbiAs9C|Nk4`Nl!>PuugJaN8>}e!~g$Jf9RK#^dRZS`4?U1T?@|k{QsYCnW;aQ z|MBa$H49Ii{P|wa?yS!gmKz5$(<~pVn4Zk}pRD+7KF{Qit0~+57cvVAA66A(V`FOz z?%TwBB+KMhv48)>nLGd4Ge2IsP%5D%_K|E^c|Vd;Ir8L`7~m+2du4sipy zW6=|L7__l;ZvMdWO2v)$aCQCe1fIhWoK}>UhL)BdzxaGrL8}&1D@T0S_1c$@e@_on z;xdYOu%<#gRZpuV%Yn>SAU@e{pYL05`Z_f9U(|(dcdcec-M`~-CHMC3;HUr1 zxBNE0Vc%9)BjB~@=+parN1M&8Rut5q?LW)@{Y~)Jz0W)!OSGr%EsQb$$E+?KWp-8Z S`F~&-GI+ZBxvXrkk diff --git a/plugins/monstro/sqrsoft.png b/plugins/monstro/sqrsoft.png index 2e5626d20538b8aaca92137852baa9687602a89b..037fcab12bf443e946f6682723d10159b1d5adf8 100644 GIT binary patch literal 453 zcmV;$0XqJPP)^!sl=%!CVuPt=E?i#c|;52XW@b$86P0Bgq4}}1wSBwOfg)M@wOzAU(2ri z@vilo*;FY`zz4u+RU&EO&^WyUI7OqvWIf-m0kHzg9zCY&3BL-eT}>y`t;OJ^`YfY9 zr?=tj+~D1J0;cVL(gT3!x_je#48P=$3IwOM<)9cA0Q~aYK&|PAj*;7x=M4p=``v$k z#Dsun9?diQCIuYNYK1m8t%HMRubx>O68wlJekQi0a#P v`o78IFkSb$#yl7GM8>&Fap!e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DzZL_t(2&yCW*YE)qmhVkEg z=j^T_0f~(kk@zQ|g4ie`R)UQ}3L9_0I}ij@T8Y?r2e}8a(9*_En;=9a5ReEKN)V#U z?%8w3W`mo=!grWvhKG4)n7FZ-XM;x(Rx!vl!mFyy^%USsY)F*~V5_#$iz?=yU>(wk}Tvhc9! zS=ifB4nW9hw54b#J)IO1sZ@>HAss3FOT!&x#w-*Fq10nBi9-wY7%r)R??#U+s*Z$hJiXG*Udk^%DvyT6g0r=!Iy}yAHt&nbRm|RFvIk80o6W~V zVbAjdfJj`;JgWjY^~(Rnx%I;wCO5%OZNdxp<}=ShJ_vH%ZyY@wh|^oN zw*m3#P)WvXpVFuV-7bY^+q(;wL&H7_dLv)&-0O>Ha^nGT-W>JaV&u4F^FDkK))z?h91poj507*qoM6N<$ Eg8o4HO#lD@ literal 602 zcmV-g0;Te zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00F{DL_t(2&t1|zOO*i_#_`|% zc+PX|&`^S#6i&Wy93r97MaZG`nWC)^qFU(mzd|FK&(uagQ#+ae z6&lr|xY^!9`;{mzl)_wu`}i5*zA#r@DEF)Xq0E@v(}==srjC@!fs~m#QJ9_F(~udr zP}LR9OHH98JP=NTo^W#AJIzbYs_PocjMHhwFtn4ENK4p?@CsXzmXeiWXrE4B?Te}_ zhErM!Ytpi?gUuZKj!j`lT2@#aPH9zLQS4VjTPs-*X7DA`=ZSEZ=`+3vGs%Ls)_x_5 z$vq8Yvq1-vo~DEId-|FVk{$#d<0~P>tpFZM$H8u#8Th7-GlO7PI>y5rA;q}iuC#(B zVN30O`NLrQvAX;#)-I-fpOi^%Cyb(zkCP5ufgTq&KwQKsH# z!l+wG=vHzxVU($dqX;w7Vj-*sC64NJ*q<{NSH~2Q{W;@09ZE+@DLidR?=TiVX!^aq oq4rO Date: Sat, 13 Apr 2019 14:30:46 -0600 Subject: [PATCH 2/2] Shrink ComboBox arrow section slightly This is being done for two reasons: 1. The new Monstro icons (and the icons for Microwave when it's finished) are too large. 2. All ComboBoxes (subjectively) look much nicer this way. --- src/gui/widgets/ComboBox.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/widgets/ComboBox.cpp b/src/gui/widgets/ComboBox.cpp index 0673ee32d4b..c796bfa74c8 100644 --- a/src/gui/widgets/ComboBox.cpp +++ b/src/gui/widgets/ComboBox.cpp @@ -42,7 +42,7 @@ QPixmap * ComboBox::s_background = NULL; QPixmap * ComboBox::s_arrow = NULL; QPixmap * ComboBox::s_arrowSelected = NULL; -const int CB_ARROW_BTN_WIDTH = 20; +const int CB_ARROW_BTN_WIDTH = 18; ComboBox::ComboBox( QWidget * _parent, const QString & _name ) : @@ -198,7 +198,7 @@ void ComboBox::paintEvent( QPaintEvent * _pe ) QPixmap * arrow = m_pressed ? s_arrowSelected : s_arrow; - p.drawPixmap( width() - CB_ARROW_BTN_WIDTH + 5, 4, *arrow ); + p.drawPixmap( width() - CB_ARROW_BTN_WIDTH + 3, 4, *arrow ); if( model() && model()->size() > 0 ) { @@ -251,4 +251,3 @@ void ComboBox::setItem( QAction* item ) -