remove hardcoded icon size here as well

1 files changed, 13 insertions, 12 deletions

diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 267714e..6148308 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -9,56 +9,57 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 
 #include "irda.h"
 
 /* OPIE */
 #include <opie2/otaskbarapplet.h>
+#include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Ui;
 
 /* QT */
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 
 /* STD */
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 //===========================================================================
 
-using namespace Opie::Ui;
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
                 : QWidget ( parent, name )
 {
-        setFixedHeight ( 18 );
-        setFixedWidth ( 14 );
+    setFixedHeight( AppLnk::smallIconSize() );
+    setFixedWidth( AppLnk::smallIconSize() );
 
-        m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
+    m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP );
 
-        m_irdaOnPixmap          = Resource::loadPixmap( "irdaapplet/irdaon" );
-        m_irdaOffPixmap         = Resource::loadPixmap( "irdaapplet/irdaoff" );
-        m_irdaDiscoveryOnPixmap = Resource::loadPixmap( "irdaapplet/magglass" );
-        m_receiveActivePixmap   = Resource::loadPixmap( "irdaapplet/receive" );
+    m_irdaOnPixmap = Resource::loadImage( "irdaapplet/irdaon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
+    m_irdaOffPixmap = Resource::loadImage( "irdaapplet/irdaoff" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
+    m_irdaDiscoveryOnPixmap = Resource::loadImage( "irdaapplet/magglass" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
+    m_receiveActivePixmap = Resource::loadImage( "irdaapplet/receive" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize());
 
         m_irda_active = false;
         m_irda_discovery_active = false;
         m_receive_active = false;
         m_receive_state_changed = false;
         m_popup = 0;
                 m_wasOn = false;
                 m_wasDiscover = false;
 
         QCopChannel* chan = new QCopChannel("QPE/IrDaApplet", this );
         connect(chan, SIGNAL(received(const QCString&,const QByteArray&) ),
                 this, SLOT(slotMessage(const QCString&,const QByteArray&) ) );
@@ -305,33 +306,33 @@ void IrdaApplet::timerEvent ( QTimerEvent * )
         m_irda_active = checkIrdaStatus ( );
         m_irda_discovery_active = checkIrdaDiscoveryStatus ( );
 
         if ( m_irda_discovery_active )
                 showDiscovered ( );
 
         if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate )
                 update ( );
 }
 
 void IrdaApplet::paintEvent ( QPaintEvent * )
 {
-        QPainter p ( this );
+        QPainter p( this );
 
-        p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
+        p.drawPixmap( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
 
         if ( m_irda_discovery_active )
-                    p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
+                    p.drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
 
         if ( m_receive_active )
-                p. drawPixmap( 0, 1, m_receiveActivePixmap );
+                p.drawPixmap( 0, 1, m_receiveActivePixmap );
 }
 /*
  * We know 3 calls
  * a) enable
  * b) disable
  * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on
  * c) listDevices: We will return a list of known devices
  */
 void IrdaApplet::slotMessage( const QCString& str, const QByteArray&  ) {
     if ( str == "enableIrda()") {
         m_wasOn = checkIrdaStatus();
         m_wasDiscover = checkIrdaDiscoveryStatus();