remove hardcoded icon size here as well

2 files changed, 14 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index f996c66..bbd22a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,130 +1,131 @@
         2004-??-??Opie 1.1.x
 
         New Features
         ------------
         * libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
         * Backup now uses the busy indicator when backing up and restore (ar)
         * OpiePlayer2 gained adding of Directories to the playlist (zecke)
         * OpiePlayer2 better error handling (zecke)
         * OpiePlayer2 progress indication while streaming (zecke)
         * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
         * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
         * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
         * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
         * Opie-Console use Custom Font and Size in a Profile (harlekin)
         * Opie-Console transparently log the Output and Input to a file (harlekin)
         * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
         * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
         * Opie-Security gained a 'test authentication' button (clem)
 
         Fixed Bugs
         ----------
         * #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
         * #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
         * #1245 - Opie-Go 'paused' (zecke)
         * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
         * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
         * #1395 - Build VNC Backend with gcc3.4
         * #1440 - The icon of opie-mobilemsg is missing (CoreDump)
         * #1445 - Opie-Sheet Has No Icon (CoreDump)
         * #1448 - Brightness Applet added (mickeyl)
         * #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
         * n.a.  - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
         * n.a.  - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
         * n.a.  - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
         * n.a.  - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
+        * n.a.  - Removed hardcoded icon size in a couple of applets (mickeyl)
 
         2004-09-17Opie 1.1.6
 
         New Features
         ------------
         * Fifteen gained configurable number of items (zecke)
         * Fifteen can have custom background images (zecke)
         * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
         * Integrated the new security framework into libopie2 (zecke,clem)
         * Converted the launcher to use the new security framework (zecke)
         * Backup can now handle custom locations for backup and restore (ar)
         * Implemented right-on-hold feedback (wimpie,zecke)
         * Lots of new features in opie-reader (tim,pohly)
         * Build system cleanups (schurig)
 
         Fixed Bugs
         --------
         * #1005 - Fixed backup to CompactFlash (ar)
         * #1167 - Fixed Opie write crashing on more text than one page (ar)
         * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
         * #1359 - Fixed bookmarks in Gutenbrowser (ljp)
         * #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
         * #1370 - Pimconverter now reacts on cancel key (eilers)
         * #1376 - Bring back the capslock/numlock display (zecke)
         * #1383 - Language settings now warns about losing open apps (Markus Litz)
         * #1393 - Fixed line wrap issues in opie-console for the default profile (mickeyl)
         * #1394 - Fixed oversized headline in opie-login (coredump)
         * #1396 - Opie-console captures the escape key and vim is working (zecke)
         * #1401 - Scrollbar is now only visible if necessary in DocTab (mickeyl)
 
         2004-07-06Opie 1.1.4
 
         New Features
         ------------
         * Added four themes courtesy Robert Griebl (http://www.softforge.de/zstyle)
         * Added Conversion tool for pim-data (eilers)
         * Introduced new OPimAccessFactory and OBackendFactory which simplyfies database access (eilers)
         * Modified the PIM API for providing generic use of OPimRecords (eilers)
         * Clicking on the application symbol now iterates over the application's top level widgets if already raised (zecke)
 
         Fixed Bugs
         --------
         * #1068 - Country Drop Down Box Off Screen
         * #1291 - Opie tinykate does not open .desktop files (ar)
         * #1291 - Opie sheet not saving correctly (ar)
         * #1294 - Opie does not know about British Summer Time
         * #1314 - Drawpad initialization (mickeyl)
         * #1317 - Packagemanager crashes on hold-down or install (chicken)
         * #1321 - Batteryapplet graphic glitch (harlekin)
         * #1324 - ZSafe not starting up (mickeyl)
         * #1328 - Personal Home Address fields is trimmed to 1char (eilers)
         * #1327 - Opie-mail ipk does not depend on libopiedb2 (chicken)
         * #1345 - Networksettingsplugin wlan plugin dependency on libpcap0 (mickeyl)
         * #1348 - Datebook dependency on libopiedb2 (chicken)
         * #1328 - Switched SQLDatabase and VCards char encoding from latin1 to unicode (eilers)
 
         2004-04-25Opie 1.1.3
 
         * Introduced first implementation of SQL-Support using SQLite (eilers)
         * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
         * Added a real system graffiti character set (brad)
         * Added Generic Keyconfig Widget (zecke)
         * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
         * Added new Bible reader app - opie-dagger (drw)
         * Added a new Image Viewer. Work is ongoing (zecke,alwin)
         * Added namespace usage in libopie2 and everywhere (zecke,alwin)
         * Enabled the possibility to pass command line arguments to applications (mickeyl)
         * Added an about applet showing some credits and information about Opie (mickeyl)
         * Added benchmarking functionality to sysinfo (mickeyl)
         * Added applet and configuration application for switching hardware keyboard layouts (alwin)
         * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
         * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
         * Clean-up of package information in control files (drw)
         * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
         * Improved big-screen support (zecke,ar)
         * Improved multikeyboard support, added keyboard layout switching applet (mouse)
         * Added a new mail client based on libetpan (harlekin,alwin,jgf)
         * Added new package manager - opie-packagemanager (drw)
         * Improved light-n-power for C7x0 (mickeyl)
         * Added automatic rotation support for C7x0 (treke)
         * Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
         * Added scanning the wireless network neighbourhood to networksettings (mickeyl)
 
         2003-11-29Opie 1.0.3
 
         * Released as Version 1.0.3
         * Improved i18n (various contributors)
         * Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
         * Made the Documents Tab optional (mickeyl)
         * Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
 
         2003-08-04Opie 1.0.0
 
         * Released as Version 1.0.0
         * Including a PPP module for easy dial up (tille,harlekin,zecke)
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
@@ -1,363 +1,364 @@
 /**********************************************************************
 ** Copyright (C) 2002 David Woodhouse <dwmw2@infradead.org>
 **                    Max Reiss <harlekin@handhelds.org> [trivial stuff]
 **                    Robert Griebl <sandman@handhelds.org>
 **                    Holger Freyther <zecke@handhelds.org> QCOP Interface
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** 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&) ) );
 }
 
 int IrdaApplet::position()
 {
         return 6;
 }
 
 void IrdaApplet::show()
 {
         QWidget::show ( );
         startTimer ( 2000 );
 }
 
 IrdaApplet::~IrdaApplet()
 {
         if ( m_sockfd >= 0 )
                 ::close ( m_sockfd );
 }
 
 void IrdaApplet::popup ( QString message, QString icon )
 {
         if ( !m_popup )
                 m_popup = new QPopupMenu ( this );
 
         m_popup-> clear ( );
 
         if ( icon. isEmpty ( ))
                 m_popup-> insertItem ( message, 0 );
         else
                 m_popup-> insertItem ( QIconSet ( Resource::loadPixmap ( icon )), message, 0 );
 
         QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
         QSize s = m_popup-> sizeHint ( );
         m_popup-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
                                    p. y ( ) - s. height ( )));
 
         QTimer::singleShot ( 2000, this, SLOT( popupTimeout()));
 }
 
 void IrdaApplet::popupTimeout ( )
 {
         m_popup-> hide ( );
 }
 
 bool IrdaApplet::checkIrdaStatus ( )
 {
         struct ifreq ifr;
         strcpy ( ifr. ifr_name, "irda0" );
 
         if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                 return false;
 
         return ( ifr. ifr_flags & IFF_UP );
 }
 
 bool IrdaApplet::setIrdaStatus ( bool b )
 {
         struct ifreq ifr;
         strcpy ( ifr. ifr_name, "irda0" );
 
         if ( ::ioctl ( m_sockfd, SIOCGIFFLAGS, &ifr ) < 0 )
                 return false;
 
         if ( b ) {
                 ifr. ifr_flags |= IFF_UP;
         }
         else {
                 setIrdaDiscoveryStatus ( 0 );
                 setIrdaReceiveStatus ( 0 );
                 ifr. ifr_flags &= ~IFF_UP;
         }
 
         if ( ::ioctl ( m_sockfd, SIOCSIFFLAGS, &ifr ) < 0 )
                 return false;
 
         return true;
 }
 
 bool IrdaApplet::checkIrdaDiscoveryStatus ( )
 {
         QFile discovery ( "/proc/sys/net/irda/discovery" );
 
         QString streamIn = "0";
 
         if ( discovery. open ( IO_ReadOnly )) {
                 QTextStream stream ( &discovery );
                 streamIn = stream. read ( );
         }
 
         return streamIn. toInt ( ) > 0;
 }
 
 
 bool IrdaApplet::setIrdaDiscoveryStatus ( bool d )
 {
         QFile discovery ( "/proc/sys/net/irda/discovery" );
 
         if ( discovery. open ( IO_WriteOnly | IO_Raw )) {
                 discovery.putch ( d ? '1' : '0' );
                 return true;
         }
         return false;
 }
 
 
 bool IrdaApplet::setIrdaReceiveStatus ( bool d )
 {
         QCopEnvelope e ( "QPE/Obex", "receive(int)" );
         e << ( d ? 1 : 0 );
 
         m_receive_active = d;
         m_receive_state_changed = true;
 
         return true;
 }
 
 
 void IrdaApplet::showDiscovered ( )
 {
         //static Sound snd_found ( "irdaapplet/irdaon" );
         //static Sound snd_lost ( "irdaapplet/irdaoff" );
 
         QFile discovery ( "/proc/net/irda/discovery" );
 
         if ( discovery. open ( IO_ReadOnly )) {
                 bool qcopsend = false;
 
                 QString discoveredDevice;
                 QString deviceAddr;
 
                 // since it is /proc we _must_ use QTextStream
                 QStringList list =  QStringList::split ( "\n", QTextStream ( &discovery ). read ( ));
 
                 QMap <QString, QString>::Iterator it;
 
                 for ( it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                         it. data ( ). prepend ( "+++" );
 
                 for ( QStringList::Iterator lit = list. begin ( ); lit != list. end ( ); ++lit ) {
                         const QString &line = *lit;
 
                         if ( line. startsWith ( "nickname:" )) {
                                 discoveredDevice = line. mid ( line. find ( ':' ) + 2, line. find ( ',' ) - line. find ( ':' ) - 2 );
                                 deviceAddr       = line. mid ( line. find ( "daddr:" ) + 9, 8 );
 
                                 // odebug << discoveredDevice + "(" + deviceAddr + ")" << oendl;
 
                                 if ( !m_devices. contains ( deviceAddr )) {
                                         popup ( tr( "Found:" ) + " " + discoveredDevice );
                                         //snd_found. play ( );
                                         qcopsend = true;
                                 }
                                 m_devices. replace ( deviceAddr, discoveredDevice );
                         }
                 }
 
                 for ( it = m_devices. begin ( ); it != m_devices. end ( ); ) {
                         // odebug << "IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?" << oendl;
 
                         if ( it. data ( ). left ( 3 ) == "+++" ) {
                                 popup ( tr( "Lost:" ) + " " + it. data ( ). mid ( 3 ));
                                 //snd_lost. play ( );
 
                                 QMap <QString, QString>::Iterator tmp = it;
                                 tmp++;
                                 m_devices. remove ( it ); // in contrast to QValueListIterator this remove doesn't return the next Iterator
                                 it = tmp;
 
                                 qcopsend = true;
                         }
                         else
                                 it++;
                 }
                 // XXX if( qcopsend ) {
                     QCopEnvelope e ( "QPE/Network", "irdaSend(bool)" );
                     e << ( m_devices. count ( ) > 0 );
                 // }
         }
 }
 
 void IrdaApplet::mousePressEvent ( QMouseEvent * )
 {
         QPopupMenu *menu = new QPopupMenu ( this );
         QString cmd;
 
         /* Refresh active state */
         timerEvent ( 0 );
 
                 //menu->insertItem( tr("More..."), 4 );
 
         if ( m_irda_active && !m_devices. isEmpty ( )) {
                 menu-> insertItem ( tr( "Discovered Device:" ), 9 );
 
                 for ( QMap<QString, QString>::Iterator it = m_devices. begin ( ); it != m_devices. end ( ); ++it )
                         menu-> insertItem ( *it );
 
                 menu-> insertSeparator ( );
         }
 
         menu-> insertItem ( m_irda_active ? tr( "Disable IrDA" ) : tr( "Enable IrDA" ), 0 );
 
         if ( m_irda_active ) {
                 menu-> insertItem ( m_irda_discovery_active ? tr( "Disable Discovery" ) : tr( "Enable Discovery" ), 1 );
                 menu-> insertItem ( m_receive_active ? tr( "Disable Receive" ) : tr( "Enable Receive" ), 2 );
         }
 
         QPoint p = mapToGlobal ( QPoint ( 0, 0 ) );
         QSize s = menu-> sizeHint ( );
 
         p = QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ));
 
         switch (  menu-> exec ( p )) {
                 case 0:
                         setIrdaStatus ( !m_irda_active );
                         timerEvent ( 0 );
                         break;
                 case 1:
                         setIrdaDiscoveryStatus ( !m_irda_discovery_active );
                         timerEvent ( 0 );
                         break;
                 case 2:
                         setIrdaReceiveStatus ( !m_receive_active );
                         timerEvent( 0 );
                         break;
         }
 
         delete menu;
 }
 
 void IrdaApplet::timerEvent ( QTimerEvent * )
 {
         bool oldactive = m_irda_active;
         bool olddiscovery = m_irda_discovery_active;
         bool receiveUpdate = false;
 
         if ( m_receive_state_changed ) {
                 receiveUpdate = true;
                 m_receive_state_changed = false;
         }
 
         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();
         if (!m_wasOn)  {
             setIrdaStatus( true );
         }
         if ( !m_wasDiscover ) {
             setIrdaDiscoveryStatus ( true );
         }
     } else if ( str == "disableIrda()") {
         if (!m_wasOn)  {
             setIrdaStatus( false );
         }
         if ( !m_wasDiscover ) {
             setIrdaDiscoveryStatus ( false );
         }
     } else if ( str == "listDevices()") {
         QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)");
 
         QStringList list;
         QMap<QString, QString>::Iterator it;
         for (it = m_devices.begin(); it != m_devices.end(); ++it )
             list << (*it);
 
         e << list;
     }
 }
 
 EXPORT_OPIE_APPLET_v1( IrdaApplet )