From a1b89f09d802b621031035dfdcd81e6932bd84b6 Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Wed, 7 Jul 2021 13:01:30 +0300 Subject: [PATCH] Naughty applet: dynamic applet size This commit also replaces old 20x20 pixmap with new ones if higher quality. This solves issue #213. Signed-off-by: Mavridis Philippe (cherry picked from commit e22588e97dc93fd9b38362fede37fb23b3eb4af6) --- kicker/applets/naughty/NaughtyApplet.cpp | 21 +++++---------------- kicker/applets/naughty/NaughtyApplet.h | 2 -- kicker/applets/naughty/naughty-happy.png | Bin 391 -> 2094 bytes kicker/applets/naughty/naughty-sad.png | Bin 374 -> 2104 bytes 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 1da45a350..8eb26afbc 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -67,7 +67,6 @@ NaughtyApplet::NaughtyApplet setBackgroundOrigin( AncestorOrigin ); button_ = new SimpleButton(this); - button_->setFixedSize(20, 20); TQVBoxLayout * layout = new TQVBoxLayout(this); layout->addWidget(button_); @@ -132,25 +131,15 @@ NaughtyApplet::slotWarn(ulong pid, const TQString & name) } } - int -NaughtyApplet::widthForHeight(int) const -{ - return 20; -} - - int -NaughtyApplet::heightForWidth(int) const -{ - return 20; -} void NaughtyApplet::slotLoad(uint l) { - if (l > monitor_->triggerLevel()) - button_->setPixmap(BarIcon("naughty-sad")); - else - button_->setPixmap(BarIcon("naughty-happy")); + button_->setPixmap(TDEGlobal::iconLoader()->loadIcon( + (l > monitor_->triggerLevel() ? "naughty-sad" : "naughty-happy"), + TDEIcon::Panel, + TQMIN(size().width(),size().height())-2 + )); } void diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h index eb9850851..a907ca9bb 100644 --- a/kicker/applets/naughty/NaughtyApplet.h +++ b/kicker/applets/naughty/NaughtyApplet.h @@ -46,8 +46,6 @@ class NaughtyApplet : public KPanelApplet ~NaughtyApplet(); - virtual int widthForHeight(int h) const; - virtual int heightForWidth(int w) const; signals: diff --git a/kicker/applets/naughty/naughty-happy.png b/kicker/applets/naughty/naughty-happy.png index 4c3505dfc700e181d9236c0e70273ffdc41e18db..cbd451365d182f74e0d279a00c16b0f301295677 100644 GIT binary patch literal 2094 zcmV+}2+{Y6P)pF8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H12fIl` zK~#90?VD{(R970ue2jTO)tMrwCt&|wgTnX@16GK0M6 zy~E7CHuax8$;_F1&Uya-dvfkQ&+`mC!0#LLRG7n%oz0UuIW(lDk)51O`oj+s@AspN zjYS7AKF;X;`HXrzj0_FocDuRaa&h#^6;1#n(R40a0%TQI(zxEdvYBZGnhtc{JF*tQMVzyLys$k@ODV#^l# zEf$VH@(32Kc}_z~3D4MUbhfo|BM^uj@u?OFAPyYhhRw#Aq9SZs^CmtXV@(Z*KKTSs zv`Eipd-vion`zhU$<~B?Ss5EPZKBubQ#C~Q^Vw%y*NXU5 zYj5Xzbv3&IncHmmNHUu_?Q-GQn)Fn2ItkR*a|TF^3Uh;jESrsQhlaE#JDUv-BAS}$ zG8o8=H2)-%Md3{ zgiqeJtS#2_Ah6mj8#vN77*xlvxu#<0l8$79^IiC(#r9XWzXN0u ze|Q3H*l_1qfUsDUkJHjZk6zD0#R9Ba#gXA*`4heL(sYNDlMxp$h9^K>-SqL6EmJ;@ z&xcsOnzq?^#>~`MQo=JWEmRu}@&!vun%<_<&D<^rGtI5Up9$#ouwet{;$p0_JK1b} zsZ{Cyenfu$op;P?4Sx?fbqbN085%1g0rAc|;g9#!Q=FDX-e{!p;KA@-bHDipQD2WR znGi3&C~ainIxGa@*fE67hG=L&y!YPR#@e@!8~OP(+*5$YMovWYNUN0v0tkzRV^jG~ z-2*afYFIK)jX;^om^Tlec!H&Hm)GRVO8y?nNY4FcE*GM*lC6_D-?0J;3aHA;iq0Ll zACR35`T4Az+%{PNeQ`0lD*L25^7F|B^b_BM0%T@VZ?%%6iB~G(>8CN~@cHn{9iY1#e*IPcgwaN4Cp`bW{OgB@LtKLb zT)W1g+yUC#;mtSYPZ(`{_#v!WBma80n`_e=moMjEH*d;2R$ji0NK2Elvsxc%ScUe48?eHO8Kv$8&~zmAi;1w{cY7LF?oi@)#!V(nV>$nV%8 zB}?T#wSP zY8x9nw>bs}Va*ykPM+kC5Sd66BkMsg_;7jNfeLB$2-JGhl(q#J@lNltHaYPuPJ23{_XN z6I9G?l$P?>mKJ)n42yZa(sRDNoOP-ZpMtE%AIH9D4{o)|@7~Se>eaLx3}|1|Qe2GH zX5-BM{alaspQh|~t~WN)QCKMRWTz(b^J%bHIR3^PIImoZ9C4Qmv3WDjh6ax1RvC@dtexf$c~<;3Z9@;Z->!nt#d9Xcfaak96U&hzKl4*WOLj;c`+ zsL#rx)@YJU~S7 YKa}9Zyb$P)LjV8(07*qoM6N<$f~!&z`2YX_ literal 391 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 QfWgGz>FVdQ&MBb@0BG@&#sB~S