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 <[email protected]>

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 4c3505dfc..cbd451365 100644
--- a/kicker/applets/naughty/naughty-happy.png
+++ b/kicker/applets/naughty/naughty-happy.png
diff --git a/kicker/applets/naughty/naughty-sad.png b/kicker/applets/naughty/naughty-sad.png
index ae6d727f2..82a8279f5 100644
--- a/kicker/applets/naughty/naughty-sad.png
+++ b/kicker/applets/naughty/naughty-sad.png