6 files changed, 23 insertions, 9 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 078ce8d..15eb762 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -1,166 +1,170 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "battery.h"
 #include "batterystatus.h"
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qpeapplication.h>
 
 #include <qpainter.h>
 #include <qtimer.h>
 
 
 BatteryMeter::BatteryMeter( QWidget *parent )
     : QWidget( parent ), charging(false)
 {
     ps = new PowerStatus;
     startTimer( 10000 );
+
+    setFixedWidth(  QMAX(AppLnk::smallIconSize()*3/4, 6) );
     setFixedHeight( AppLnk::smallIconSize() );
+
     chargeTimer = new QTimer( this );
     connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) );
     timerEvent(0);
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
     Config c( "qpe" );
     c.setGroup( "Battery" );
     style = c.readNumEntry( "Style", 0 );
 }
 
 BatteryMeter::~BatteryMeter()
 {
     delete ps;
 }
 
 QSize BatteryMeter::sizeHint() const
 {
-    return QSize(10, height() );
+    return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() );
 }
 
 void BatteryMeter::mousePressEvent( QMouseEvent* e )
 {
     if ( e->button() == RightButton )
     {
         style = 1-style;
         Config c( "qpe" );
         c.setGroup( "Battery" );
         c.writeEntry( "Style", style );
         repaint( true );
     }
     QWidget::mousePressEvent( e );
 }
 
 void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
 {
     if ( batteryView && batteryView->isVisible() ) {
         delete (QWidget *) batteryView;
     } else {
         if ( !batteryView ) batteryView = new BatteryStatus( ps );
         batteryView->showMaximized();
         batteryView->raise();
         batteryView->show();
     }
 }
 
 void BatteryMeter::timerEvent( QTimerEvent * )
 {
     PowerStatus prev = *ps;
 
     *ps = PowerStatusManager::readStatus();
 
     if ( prev != *ps ) {
     percent = ps->batteryPercentRemaining();
     if ( !charging && ps->batteryStatus() == PowerStatus::Charging && percent < 0 ) {
         percent = 0;
         charging = true;
         chargeTimer->start( 500 );
     } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) {
         charging = false;
         chargeTimer->stop();
         if ( batteryView )
         batteryView->updatePercent( percent );
     }
     repaint( style != 0 );
     if ( batteryView )
         batteryView->repaint();
     }
 }
 
 void BatteryMeter::chargeTimeout()
 {
     percent += 20;
     if ( percent > 100 )
         percent = 0;
 
     repaint(FALSE);
     if ( batteryView )
         batteryView->updatePercent( percent );
 }
 
 void BatteryMeter::paintEvent( QPaintEvent* )
 {
+    qWarning("paint");
     if ( style == 1 )
     {
         QPainter p(this);
         QFont f( "Fixed", AppLnk::smallIconSize()/2 );
         QFontMetrics fm( f );
         p.setFont( f );
-        p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
-        p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
+        p.drawText( 0, height()/2, QString::number( percent ) );
+        p.drawText( width()/4, height(), "%" );
         return;
     }
 
     QPainter p(this);
     QColor color;
     QColor g = gray.light( 160 );
     switch ( ps->acStatus() )
     {
         case PowerStatus::Offline: color = blue.light( 150 ); break;
         case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break;
         default: color = red.light( 160 );
     }
 
     int w = height() / 2;
     if ( !(w%2) ) w--; // should have an odd value to get a real middle line
     int h = height() - 4;
     int pix = (percent * h) / 100;
     int y2 = height() -2;
     int y = y2 - pix;
     int x1 = (width() - w ) / 2;
 
     p.setPen(QColor(80,80,80));
     p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0);  // header
     p.drawRect(x1,1,w,height()-1);      // corpus
     p.setBrush(color);
 
     int extra = ((percent * h) % 100)/(100/4);
 
     int middle = w/2;
     for ( int i = 0; i < middle; i++ )
     {
         p.setPen( gray.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 );
         p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 );
         p.setPen( color.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
         p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
     }
 }
 
diff --git a/core/applets/clipboardapplet/clipboard.cpp b/core/applets/clipboardapplet/clipboard.cpp
index 21b68e3..bb0db9b 100644
--- a/core/applets/clipboardapplet/clipboard.cpp
+++ b/core/applets/clipboardapplet/clipboard.cpp
@@ -1,172 +1,178 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "clipboard.h"
 
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 
 #include <qpainter.h>
 #include <qpopupmenu.h>
 #include <qwindowsystem_qws.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qtimer.h>
 
 //===========================================================================
 
 
 ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
 {
-                setFixedWidth ( AppLnk::smallIconSize()  );
-                setFixedHeight ( AppLnk::smallIconSize()  );
-        m_clipboardPixmap = QPixmap ( Resource::loadPixmap( "paste" ) );
+        setFixedWidth ( AppLnk::smallIconSize()  );
+        setFixedHeight ( AppLnk::smallIconSize()  );
+
+        QImage img = Resource::loadImage( "paste");
+        img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
+
+        m_clipboardPixmap.convertFromImage( img );
 
         m_timer = new QTimer ( this );
 
         connect ( QApplication::clipboard ( ), SIGNAL( dataChanged ( )), this, SLOT( newData ( )));
         connect ( m_timer, SIGNAL( timeout ( )), this, SLOT( newData ( )));
         connect ( qApp, SIGNAL( aboutToQuit ( )), this, SLOT( shutdown ( )));
 
         m_menu = 0;
         m_dirty = true;
         m_lasttext = QString::null;
 
         m_timer-> start ( 0, true );
 }
 
 ClipboardApplet::~ClipboardApplet ( )
 {
 }
 
 void ClipboardApplet::shutdown ( )
 {
         // the timer has to be stopped, or Qt/E will hang on quit()
         // see launcher/desktop.cpp
 
         m_timer-> stop ( );
 }
 
 void ClipboardApplet::mousePressEvent ( QMouseEvent *)
 {
         if ( m_dirty ) {
                 delete m_menu;
 
                 m_menu = new QPopupMenu ( this );
                 m_menu-> setCheckable ( true );
 
                 if ( m_history. count ( )) {
                         for ( unsigned int i = 0; i < m_history. count ( ); i++ ) {
                                 QString str = m_history [i];
 
                                 if ( str. length ( ) > 20 )
                                         str = str. left ( 20 ) + "...";
 
                                 m_menu-> insertItem ( QString ( "%1: %2" ). arg ( i + 1 ). arg ( str ), i );
                                 m_menu-> setItemChecked ( i, false );
                         }
                         m_menu-> setItemChecked ( m_history. count ( ) - 1, true );
                         m_menu-> insertSeparator ( );
                 }
                 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "cut" )), tr( "Cut" ), 100 );
                 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "copy" )), tr( "Copy" ), 101 );
                 m_menu-> insertItem ( QIconSet ( Resource::loadPixmap ( "paste" )), tr( "Paste" ), 102 );
 
                 connect ( m_menu, SIGNAL( activated ( int )), this, SLOT( action ( int )));
 
                 m_dirty = false;
         }
         QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
         QSize s = m_menu-> sizeHint ( );
 
         m_menu-> popup ( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( )));
 }
 
 void ClipboardApplet::action(int id)
 {
         ushort unicode = 0;
         int scan = 0;
 
         switch ( id ) {
                 case 100:
                         unicode = 'X' - '@';
                         scan    = Key_X; // Cut
                         break;
                 case 101:
                         unicode = 'C' - '@';
                         scan    = Key_C; // Copy
                         break;
                 case 102:
                         unicode = 'V' - '@';
                         scan    = Key_V; // Paste
                         break;
 
                 default:
                         if (( id >= 0 ) && ( uint( id ) < m_history. count ( ))) {
                                 QApplication::clipboard ( )-> setText ( m_history [id] );
 
                                 for ( uint i = 0; i < m_history. count ( ); i++ )
                                         m_menu-> setItemChecked ( i, i == uint( id ));
 
                                 unicode = 'V' - '@';
                                 scan    = Key_V;
                         }
                         break;
         }
 
         if ( scan ) {
                 qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, true, false );
                 qwsServer-> sendKeyEvent ( unicode, scan, ControlButton, false, false );
         }
 }
 
 void ClipboardApplet::paintEvent ( QPaintEvent* )
 {
         QPainter p ( this );
-              p. drawPixmap( 0, 1,  m_clipboardPixmap );
+        /* center the height but our pixmap is as big as the height ;)*/
+              p. drawPixmap( 0, 0,
+                       m_clipboardPixmap );
 }
 
 void ClipboardApplet::newData ( )
 {
         static bool excllock = false;
 
         if ( excllock )
                 return;
         else
                 excllock = true;
 
         m_timer-> stop ( );
 
         QCString type = "plain";
         QString txt = QApplication::clipboard ( )-> text ( type );
 
         if ( !txt. isEmpty ( ) && !m_history. contains ( txt )) {
                 m_history. append ( txt );
 
                 if ( m_history. count ( ) > 5 )
                         m_history. remove ( m_history. begin ( ));
 
                 m_dirty = true;
         }
 
         m_timer-> start ( 1500, true );
 
         excllock = false;
 }
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp
index 51c2ebf..f850424 100644
--- a/core/applets/irdaapplet/irda.cpp
+++ b/core/applets/irdaapplet/irda.cpp
@@ -1,357 +1,357 @@
 /**********************************************************************
 ** 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 <qcopchannel_qws.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/sound.h>
 
 #include <qpainter.h>
 #include <qfile.h>
 #include <qtimer.h>
 #include <qtextstream.h>
 #include <qpopupmenu.h>
 
 #include <unistd.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 
 #include "irda.h"
 
 //===========================================================================
 
 IrdaApplet::IrdaApplet ( QWidget *parent, const char *name )
                 : QWidget ( parent, name )
 {
         setFixedHeight ( 18 );
         setFixedWidth ( 14 );
 
         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_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& ) ) );
 }
 
 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 );
 
                                 // qDebug(discoveredDevice + "(" + deviceAddr + ")");
 
                                 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 ( ); ) {
                         // qDebug("IrdaMon: delete " + it.currentKey() + "=" + *devicesAvailable[it.currentKey()] + "?");
 
                         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 );
 
         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 );
 }
 /*
  * 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& ar ) {
     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;
     }
 }
diff --git a/core/applets/irdaapplet/irdaappletimpl.h b/core/applets/irdaapplet/irdaappletimpl.h
index ef0c5a6..f9e855a 100644
--- a/core/applets/irdaapplet/irdaappletimpl.h
+++ b/core/applets/irdaapplet/irdaappletimpl.h
@@ -1,44 +1,46 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef IRDAAPPLETIMPL_H
 #define IRDAAPPLETIMPL_H
 
+#include <qwidget.h>
+
 #include <qpe/taskbarappletinterface.h>
 
 class IrdaApplet;
 
 class IrdaAppletImpl : public TaskbarAppletInterface
 {
 public:
     IrdaAppletImpl();
     virtual ~IrdaAppletImpl();
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual QWidget *applet( QWidget *parent );
     virtual int position() const;
 
 private:
     IrdaApplet *irda;
     ulong ref;
 };
 
 #endif
diff --git a/core/applets/rotateapplet/rotate.h b/core/applets/rotateapplet/rotate.h
index 5ac7768..de2a707 100644
--- a/core/applets/rotateapplet/rotate.h
+++ b/core/applets/rotateapplet/rotate.h
@@ -1,69 +1,71 @@
 /*
                =.            This file is part of the OPIE Project
              .=l.            Copyright (c)  2003 Maximilian Reiss <harlekin@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This library is free software; you can
 .> <_,   >  .   <=          redistribute it and/or  modify it under
 :=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%+i>       _;_.
     .i_,=:_.      -<s.       This library is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=           this library; see the file COPYING.LIB.
                                If not, write to the Free Software Foundation,
                             Inc., 59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
                                                        
 */
                                                                                        
                                                                                        
 
 #ifndef __OPIE_ROTATE_APPLET_H__
 #define __OPIE_ROTATE_APPLET_H__
 
 #include <qpe/menuappletinterface.h>
 #include <qobject.h>
 
+#include <qobject.h>
+
 class RotateApplet : public QObject, public MenuAppletInterface
 {
 
     Q_OBJECT
 
 public:
     RotateApplet ( );
     virtual ~RotateApplet ( );
 
     QRESULT queryInterface( const QUuid&, QUnknownInterface** );
     Q_REFCOUNT
 
     virtual int position() const;
     
     virtual QString name ( ) const;
     virtual QIconSet icon ( ) const;
     virtual QString text ( ) const;
     /* virtual QString tr( const char* ) const;
     virtual QString tr( const char*, const char* ) const;
     */
     virtual QPopupMenu *popup ( QWidget *parent ) const;
      virtual void activated ( );
 
 private slots:
     void channelReceived( const QCString &msg, const QByteArray & data );
 
 private:
     ulong ref;
     bool m_flipped;
 
 };
 
 #endif
diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp
index b129be3..38f827e 100644
--- a/core/applets/volumeapplet/volume.cpp
+++ b/core/applets/volumeapplet/volume.cpp
@@ -1,783 +1,783 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <stdio.h>
 
 #include "volume.h"
 
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qpainter.h>
 #include <qcheckbox.h>
 #include <qslider.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qpixmap.h>
 #include <qvbox.h>
 #include <qlabel.h>
 
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qtimer.h>
 
 #include <opie/odevice.h>
 
 #include "oledbox.h"
 
 using namespace Opie;
 
 #define RATE_TIMER_INTERVAL 100
 // Ten times per second is fine (RATE_TIMER_INTERVAL 100).  A shorter time
 // results in "hanging" buttons on the iPAQ due to quite high CPU consumption.
 
 
 /* XPM */
 static const char * vol_xpm[] = {
 "20 20 3 1",
 "   c None",
 ".  c #0000FF",
 "+  c #000000",
 "                    ",
 "        .           ",
 "        . . . .     ",
 "    . . . . . .     ",
 "    . . . . . . .   ",
 "    . . ..... . .   ",
 "  . ... ..... ...   ",
 "  ........... ....  ",
 "  ................. ",
 "++++++++++++++++++++",
 " .................. ",
 "  . ............. . ",
 "  . ..... .......   ",
 "    . ... ..... .   ",
 "    . ... ..... .   ",
 "    . ... .....     ",
 "    .  .  . . .     ",
 "       .  . .       ",
 "       .  . .       ",
 "                    "};
 /* XPM */
 static const char * mic_xpm[] = {
 "20 20 21 1",
 "   c None",
 ".  c #000000",
 "+  c #EEEEEE",
 "@  c #B4B6B4",
 "#  c #8B8D8B",
 "$  c #D5D6D5",
 "%  c #E6E6E6",
 "&  c #9C9D9C",
 "*  c #6A696A",
 "=  c #E6E2E6",
 "-  c #F6F2F6",
 ";  c #CDC6CD",
 ">  c #737573",
 ",  c #4A484A",
 "'  c #DEDEDE",
 ")  c #F6EEF6",
 "!  c #414041",
 "~  c #202020",
 "{  c #ACAEAC",
 "]  c #838583",
 "^  c #6A656A",
 "                    ",
 "            ....    ",
 "           .+@+#.   ",
 "          ..$%&%*.  ",
 "         .=-.;=>=,. ",
 "         .'+).&+!+. ",
 "         .+;+;.~+~. ",
 "         ..%{%,.... ",
 "         ..&=>=~..  ",
 "        .+..]^,..   ",
 "       .+.......    ",
 "      .%...         ",
 "     .=...          ",
 "    .+...           ",
 "   .+...            ",
 "   ....             ",
 "  ....              ",
 "  ..                ",
 " .                  ",
 ".                   "};
 
 
 static const char * bass_xpm[] = {
 "20 20 3 1",
 "       c None",
 ".      c #000000",
 "+      c #0000FF",
 "                    ",
 "                    ",
 "                    ",
 ".....   +++   ......",
 "      +++++++       ",
 "     ++    ++       ",
 "... ++ ...  ++  ++ .",
 "    +++     ++  ++  ",
 "    ++++    ++      ",
 "... ++++ .. ++ .....",
 "     ++    ++       ",
 "           ++   ++  ",
 "..........++    ++ .",
 "         ++         ",
 "        ++          ",
 "...... ++  .........",
 "       +            ",
 "                    ",
 "                    ",
 "                    "};
 
 
 static const char * treble_xpm[] = {
 "20 20 3 1",
 "       c None",
 ".      c #0000FF",
 "+      c #000000",
 "          ..        ",
 "         . ..       ",
 "         . ..       ",
 "++++++++ . .. ++++++",
 "         . .        ",
 "         ...        ",
 "++++++++ .   +++++++",
 "        ..          ",
 "      .. .          ",
 "+++  ..  ... +++++++",
 "    ..  .. ..       ",
 "    .. . .  ..      ",
 "+++ .. . . + . +++++",
 "    ..   .  ..      ",
 "     ..  . ..       ",
 "++++  ...... +++++++",
 "         .          ",
 "      .. .          ",
 "      .. .          ",
 "       ..           "};
 
 
 
 
 /* XPM */
 static const char * alarm_xpm[] = {
 "20 20 33 1",
 "   c None",
 ".  c #080602",
 "+  c #AAA602",
 "@  c #252002",
 "#  c #434202",
 "$  c #795602",
 "%  c #C3C20D",
 "&  c #DADAC2",
 "*  c #826002",
 "=  c #740502",
 "-  c #D6D602",
 ";  c #322E02",
 ">  c #826A02",
 ",  c #F1F195",
 "'  c #959215",
 ")  c #423602",
 "!  c #4B0302",
 "~  c #844315",
 "{  c #AAAA2A",
 "]  c #E2DE42",
 "^  c #BA7E04",
 "/  c #7F7502",
 "(  c #828276",
 "_  c #FEFE4E",
 ":  c #7D1902",
 "<  c #989656",
 "[  c #260B02",
 "}  c #F7F7D8",
 "|  c #DCDA5A",
 "1  c #823102",
 "2  c #B1AC6B",
 "3  c #F7F710",
 "4  c #838204",
 "                    ",
 "                    ",
 "        4'4/        ",
 "        /-^=        ",
 "       42{4>4       ",
 "      '2|+*$44      ",
 "     +2&3+$1*44     ",
 "    (%_}_+/$:>/4    ",
 "    4%_}3+#;>:*4    ",
 "    4%_}&+#[1$/4    ",
 "    4%_,2')[~~>4    ",
 "    4%33'4#@~1>4    ",
 "    4%3344#[:>/4    ",
 "   42&_3'4#@>:*44   ",
 "  42|}}3'4#[;$)$44  ",
 "444{]]2^~~:!!#.@##/ ",
 "4444-%*:==!!=...../ ",
 "       /:[..        ",
 "        /@.         ",
 "                    "};
 
 VolumeControl::VolumeControl ( VolumeApplet *icon, bool /*showMic*/, QWidget *parent, const char *name )
     : QFrame ( parent, name, WStyle_StaysOnTop | WType_Popup )
 {
   m_icon = icon;
 
   bool has_wav_alarm = true;
   bool has_bass = true;
   bool has_treble = true;
 
   switch ( ODevice::inst ( )-> model ( )) { // we need to add other devices eventually
     case Model_Zaurus_SL5000:
       has_wav_alarm = false; //poor guys probably feeling left out...
       break;
     default:
       break;
   }
 
   if ( !ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
     has_bass = false;
     has_treble = false;
   }
 
 
   setFrameStyle ( QFrame::PopupPanel | QFrame::Raised );
 
   QGridLayout *grid = new QGridLayout ( this, 1, 1, 6, 4 );
   grid-> setSpacing ( 4 );
   grid-> setMargin ( 6 );
 
   QVBoxLayout *vbox;
   QLabel *l;
 
   vbox = new QVBoxLayout ( );
   vbox-> setSpacing ( 4 );
   grid-> addLayout ( vbox, 1, 0 );
 
   upButton = new QPushButton ( this );
   upButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ));
   upButton-> setPixmap ( Resource::loadPixmap ( "up" ));
   upButton-> setFocusPolicy ( QWidget::NoFocus );
 
   vbox-> addWidget ( upButton );
 
   downButton = new QPushButton ( this );
   downButton-> setSizePolicy ( QSizePolicy ( QSizePolicy::Minimum, QSizePolicy::Expanding ));
   downButton-> setPixmap ( Resource::loadPixmap ( "down" ));
   downButton-> setFocusPolicy ( QWidget::NoFocus );
 
   vbox-> addWidget ( downButton );
 
   volSlider = new QSlider ( this );
   volSlider-> setRange ( 0, 100 );
   volSlider-> setTickmarks ( QSlider::Both );
   volSlider-> setTickInterval ( 20 );
   volSlider-> setFocusPolicy ( QWidget::NoFocus );
 
   l = new QLabel ( this );
   l-> setPixmap ( QPixmap ( vol_xpm ));
 
   grid-> addWidget ( l, 0, 1, AlignCenter );
   grid-> addWidget ( volSlider, 1, 1, AlignCenter );
 
   volLed = new OLedBox ( green, this );
   volLed-> setFocusPolicy ( QWidget::NoFocus );
   volLed-> setFixedSize ( 16, 16  );
 
   grid-> addWidget ( volLed, 2, 1, AlignCenter );
 
   QVBox *basstrebleBox = new QVBox( this );
 
   trebleSlider = new QSlider ( basstrebleBox );
   trebleSlider-> setRange ( 0, 100 );
   trebleSlider-> setTickmarks ( QSlider::Both );
   trebleSlider-> setTickInterval ( 20 );
   trebleSlider->setMaximumHeight( 40 );
   trebleSlider-> setFocusPolicy ( QWidget::NoFocus );
 
   bassSlider = new QSlider ( basstrebleBox );
   bassSlider-> setRange ( 0, 100 );
   bassSlider-> setTickmarks ( QSlider::Both );
   bassSlider-> setTickInterval ( 20 );
   bassSlider->setMaximumHeight( 40 );
   bassSlider-> setFocusPolicy ( QWidget::NoFocus );
 
   QLabel *bassLabel = new QLabel ( this );
   bassLabel-> setPixmap ( QPixmap ( bass_xpm ));
 
   QLabel *trebleLabel = new QLabel( this );
   trebleLabel->setPixmap( QPixmap ( treble_xpm ) );
 
   grid->addWidget( trebleLabel, 0, 4, AlignCenter );
   grid->addWidget( basstrebleBox, 1, 4, AlignCenter );
   grid-> addWidget ( bassLabel, 2, 4, AlignCenter );
 
   if ( !has_bass ) {
     bassSlider->hide();
     bassLabel->hide();
   }
 
   if ( !has_treble ) {
     trebleSlider->hide();
     trebleLabel->hide();
   }
 
   micSlider = new QSlider ( this );
   micSlider-> setRange ( 0, 100 );
   micSlider-> setTickmarks ( QSlider::Both );
   micSlider-> setTickInterval ( 20 );
   micSlider-> setFocusPolicy ( QWidget::NoFocus );
 
   l = new QLabel ( this );
   l-> setPixmap ( QPixmap ( mic_xpm ));
 
   grid-> addWidget ( l, 0, 2, AlignCenter );
   grid-> addWidget ( micSlider, 1, 2, AlignCenter );
 
   micLed = new OLedBox ( red, this );
   micLed-> setFocusPolicy ( QWidget::NoFocus );
   micLed-> setFixedSize ( 16, 16 );
 
   grid-> addWidget ( micLed, 2, 2, AlignCenter );
 
   alarmSlider = new QSlider ( this );
   alarmSlider-> setRange ( 0, 100 );
   alarmSlider-> setTickmarks ( QSlider::Both );
   alarmSlider-> setTickInterval ( 20 );
   alarmSlider-> setFocusPolicy ( QWidget::NoFocus );
 
   QLabel *alarmLabel = new QLabel ( this );
   alarmLabel-> setPixmap ( QPixmap ( alarm_xpm ));
 
   grid-> addWidget ( alarmLabel, 0, 3, AlignCenter );
   grid-> addWidget ( alarmSlider, 1, 3, AlignCenter );
 
   alarmLed = new OLedBox ( yellow, this );
   alarmLed-> setFocusPolicy ( QWidget::NoFocus );
   alarmLed-> setFixedSize ( 16, 16 );
 
   grid-> addWidget ( alarmLed, 2, 3, AlignCenter );
 
   if ( !has_wav_alarm ) {
     alarmSlider-> hide ( );
     alarmLabel-> hide ( );
     alarmLed-> hide ( );
   }
 
   grid-> addWidget ( new QLabel ( tr( "Enable Sounds for:" ), this ), 0, 6, AlignVCenter | AlignLeft );
 
   vbox = new QVBoxLayout ( );
   vbox-> setSpacing ( 4 );
   grid-> addMultiCellLayout ( vbox, 1, 2, 6, 6 );
 
   tapBox = new QCheckBox ( tr( "Screen Taps" ), this );
   tapBox-> setFocusPolicy ( QWidget::NoFocus );
 
   vbox-> addWidget ( tapBox, AlignVCenter | AlignLeft );
 
   keyBox = new QCheckBox ( tr( "Key Clicks" ), this );
   keyBox-> setFocusPolicy ( QWidget::NoFocus );
 
   vbox-> addWidget ( keyBox, AlignVCenter | AlignLeft );
 
   alarmBox = new QCheckBox ( tr( "Alarm Sound" ), this );
   alarmBox-> setFocusPolicy ( QWidget::NoFocus );
 
   vbox-> addWidget ( alarmBox, AlignVCenter | AlignLeft );
 
   if ( has_wav_alarm ) {
     alarmBox-> hide ( );
   }
 
   vbox-> addStretch ( 100 );
 
   setFixedSize ( sizeHint ( ));
   setFocusPolicy ( QWidget::NoFocus );
 
   rateTimer = new QTimer( this );
   connect ( rateTimer, SIGNAL( timeout ( )), this, SLOT( rateTimerDone ( )));
 
   connect ( upButton,   SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
   connect ( upButton,   SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
   connect ( downButton, SIGNAL( pressed ( )),  this, SLOT( buttonChanged ( )));
   connect ( downButton, SIGNAL( released ( )), this, SLOT( buttonChanged ( )));
 
   connect ( micSlider, SIGNAL( valueChanged ( int )), this, SLOT( micMoved( int )));
   connect ( volSlider, SIGNAL( valueChanged ( int )), this, SLOT( volMoved( int )));
   connect ( alarmSlider, SIGNAL( valueChanged ( int )), this, SLOT( alarmMoved( int )));
   connect ( bassSlider, SIGNAL( valueChanged ( int )), this, SLOT( bassMoved( int )));
   connect ( trebleSlider, SIGNAL( valueChanged ( int )), this, SLOT( trebleMoved( int )));
 
 
   connect ( volLed,   SIGNAL( toggled ( bool )), this, SLOT( volMuteToggled ( bool )));
   connect ( micLed,   SIGNAL( toggled ( bool )), this, SLOT( micMuteToggled ( bool )));
   connect ( alarmLed, SIGNAL( toggled ( bool )), this, SLOT( alarmSoundToggled ( bool )));
 
   connect ( alarmBox, SIGNAL( toggled ( bool )), this, SLOT( alarmSoundToggled ( bool )));
   connect ( keyBox,   SIGNAL( toggled ( bool )), this, SLOT( keyClickToggled ( bool )));
   connect ( tapBox,   SIGNAL( toggled ( bool )), this, SLOT( screenTapToggled ( bool )));
 
   // initialize variables
 
   readConfig ( true );
 
   // initialize the config file, in case some entries are missing
 
   writeConfigEntry ( "VolumePercent", m_vol_percent,   UPD_None );
   writeConfigEntry ( "BassPercent",   m_vol_percent,   UPD_None );
   writeConfigEntry ( "TreblePercent", m_vol_percent,   UPD_None );
   writeConfigEntry ( "Mute",          m_vol_muted,     UPD_None );
   writeConfigEntry ( "AlarmPercent",  m_alarm_percent, UPD_None );
   writeConfigEntry ( "TouchSound",    m_snd_touch,     UPD_None );
   writeConfigEntry ( "KeySound",      m_snd_key,       UPD_None );
   writeConfigEntry ( "AlarmSound",    m_snd_alarm,     UPD_Vol );
 
   writeConfigEntry ( "Mic",           m_mic_percent,   UPD_None );
   writeConfigEntry ( "MicMute",       m_mic_muted,     UPD_Mic );
 }
 
 bool VolumeControl::volMuted ( ) const
 {
   return m_vol_muted;
 }
 
 int VolumeControl::volPercent ( ) const
 {
   return m_vol_percent;
 }
 
 void VolumeControl::keyPressEvent ( QKeyEvent *e )
 {
   switch ( e-> key ( )) {
     case Key_Up:
       volSlider-> subtractStep ( );
       break;
     case Key_Down:
       volSlider-> addStep ( );
       break;
     case Key_Space:
       volLed-> toggle ( );
       break;
     case Key_Escape:
       hide ( );
       break;
   }
 }
 
 void VolumeControl::buttonChanged ( )
 {
   if ( upButton-> isDown ( ) || downButton->isDown ( )) {
     rateTimerDone ( ); // Call it one time manually, otherwise it wont get
     // called at all when a button is pressed for a time
     // shorter than RATE_TIMER_INTERVAL.
     rateTimer-> start ( RATE_TIMER_INTERVAL, false );
   }
   else
     rateTimer-> stop ( );
 }
 
 void VolumeControl::rateTimerDone ( )
 {
   if ( upButton-> isDown ( ))
     volSlider-> setValue ( volSlider-> value ( ) - 2 );
   else // if ( downButton-> isDown ( ))
     volSlider-> setValue ( volSlider-> value ( ) + 2 );
 }
 
 void VolumeControl::show ( bool /*showMic*/ )
 {
   readConfig ( );
 
   QPoint curPos = m_icon-> mapToGlobal ( QPoint ( 0, 0 ));
 
   int w = sizeHint ( ). width ( );
   int x = curPos.x ( ) - ( w / 2 );
 
   if (( x + w ) > QPEApplication::desktop ( )-> width ( ))
     x = QPEApplication::desktop ( )-> width ( ) - w;
 
   move ( x, curPos. y ( ) - sizeHint ( ). height ( ));
   QFrame::show ( );
 
 }
 
 void VolumeControl::readConfig ( bool force )
 {
   Config cfg ( "qpe" );
   cfg. setGroup ( "Volume" );
 
   int old_vp = m_vol_percent;
   int old_mp = m_mic_percent;
   int old_bass = m_bass_percent;
   int old_treble = m_treble_percent;
   bool old_vm = m_vol_muted;
   bool old_mm = m_mic_muted;
   bool old_sk = m_snd_key;
   bool old_st = m_snd_touch;
   bool old_sa = m_snd_alarm;
   int old_ap = m_alarm_percent;
 
   m_vol_percent   = cfg. readNumEntry ( "VolumePercent", 50 );
   m_mic_percent   = cfg. readNumEntry ( "Mic", 50 );
   m_bass_percent  = cfg. readNumEntry ( "BassPercent", 50 );
   m_treble_percent = cfg. readNumEntry ( "TreblePercent", 50 );
   m_vol_muted     = cfg. readBoolEntry ( "Mute", 0 );
   m_mic_muted     = cfg. readBoolEntry ( "MicMute", 0 );
   m_snd_key       = cfg. readBoolEntry ( "KeySound", 0 );
   m_snd_touch     = cfg. readBoolEntry ( "TouchSound", 0 );
   m_snd_alarm     = cfg. readBoolEntry ( "AlarmSound", 1 );
   m_alarm_percent = cfg. readNumEntry ( "AlarmPercent", 65 );
 
   if ( force || ( m_vol_percent != old_vp ))
     volSlider-> setValue ( 100 - m_vol_percent );
   if ( force || ( m_mic_percent != old_mp ))
     micSlider-> setValue ( 100 - m_mic_percent );
   if ( force || ( m_alarm_percent != old_ap ))
     alarmSlider-> setValue ( 100 - m_alarm_percent );
   if ( force || ( m_bass_percent != old_bass ))
     bassSlider-> setValue ( 100 - m_bass_percent );
   if ( force || ( m_treble_percent != old_treble ))
     trebleSlider-> setValue ( 100 - m_treble_percent );
 
 
   if ( force || ( m_vol_muted != old_vm ))
     volLed-> setOn ( !m_vol_muted );
   if ( force || ( m_mic_muted != old_mm ))
     micLed-> setOn ( !m_mic_muted );
   if ( force || ( m_snd_alarm != old_sa ))
     alarmLed-> setOn ( m_snd_alarm );
 
   if ( force || ( m_snd_key != old_sk ))
     keyBox-> setChecked ( m_snd_key );
   if ( force || ( m_snd_touch != old_st ))
     tapBox-> setChecked ( m_snd_touch );
   if ( force || ( m_snd_alarm != old_sa ))
     alarmBox-> setChecked ( m_snd_alarm );
 }
 
 
 void VolumeControl::volumeChanged ( bool /*nowMuted*/ )
 {
   int prevVol = m_vol_percent;
   bool prevMute = m_vol_muted;
 
   readConfig ( );
 
   // Handle case where muting it toggled
   if ( m_vol_muted != prevMute )
           m_icon-> redraw ( true );
   else if ( prevVol != m_vol_percent ) // Avoid over repainting
           m_icon-> redraw ( false );
 }
 
 void VolumeControl::micChanged ( bool nowMuted )
 {
   if ( !nowMuted )
     readConfig ( );
   m_mic_muted = nowMuted;
 }
 
 void VolumeControl::screenTapToggled ( bool b )
 {
   m_snd_touch = b;
   writeConfigEntry ( "TouchSound", m_snd_touch, UPD_Vol );
 }
 
 void VolumeControl::keyClickToggled ( bool b )
 {
   m_snd_key = b;
   writeConfigEntry ( "KeySound", m_snd_key, UPD_Vol );
 }
 
 void VolumeControl::alarmSoundToggled ( bool b )
 {
   m_snd_alarm = b;
   writeConfigEntry ( "AlarmSound", m_snd_alarm, UPD_Vol );
 }
 
 void VolumeControl::volMuteToggled ( bool b )
 {
   m_vol_muted = !b;
 
   m_icon-> redraw ( true );
 
   writeConfigEntry ( "Mute", m_vol_muted, UPD_Vol );
 }
 
 void VolumeControl::micMuteToggled ( bool b )
 {
   m_mic_muted = !b;
   writeConfigEntry ( "MicMute", m_mic_muted, UPD_Mic );
 }
 
 
 void VolumeControl::volMoved ( int percent )
 {
   m_vol_percent = 100 - percent;
 
   // clamp volume percent to be between 0 and 100
   m_vol_percent = ( m_vol_percent < 0 ) ? 0 : (( m_vol_percent > 100 ) ? 100 : m_vol_percent );
   // repaint just the little volume rectangle
   m_icon-> redraw ( false );
 
   writeConfigEntry ( "VolumePercent", m_vol_percent, UPD_Vol );
 }
 
 void VolumeControl::micMoved ( int percent )
 {
   m_mic_percent = 100 - percent;
 
   // clamp volume percent to be between 0 and 100
   m_mic_percent = ( m_mic_percent < 0 ) ? 0 : (( m_mic_percent > 100 ) ? 100 : m_mic_percent );
 
   writeConfigEntry ( "Mic", m_mic_percent, UPD_Mic );
 }
 
 void VolumeControl::alarmMoved ( int percent )
 {
   m_alarm_percent = 100 - percent;
 
   // clamp volume percent to be between 0 and 100
   m_alarm_percent = ( m_alarm_percent < 0 ) ? 0 : (( m_alarm_percent > 100 ) ? 100 : m_alarm_percent );
 
   writeConfigEntry ( "AlarmPercent", m_alarm_percent, UPD_None );
 }
 
 
 void VolumeControl::bassMoved ( int percent )
 {
   m_bass_percent = 100 - percent;
 
   // clamp bass percent to be between 0 and 100
   m_bass_percent = ( m_bass_percent < 0 ) ? 0 : (( m_bass_percent > 100 ) ? 100 : m_bass_percent );
 
   writeConfigEntry ( "BassPercent", m_bass_percent, UPD_Bass );
 }
 
 
 
 void VolumeControl::trebleMoved ( int percent )
 {
   m_treble_percent = 100 - percent;
 
   // clamp treble percent to be between 0 and 100
   m_treble_percent = ( m_treble_percent < 0 ) ? 0 : (( m_treble_percent > 100 ) ? 100 : m_treble_percent );
 
   writeConfigEntry ( "TreblePercent", m_treble_percent, UPD_Treble );
 }
 
 
 
 void VolumeControl::writeConfigEntry ( const char *entry, int val, eUpdate upd )
 {
   Config cfg ( "qpe" );
   cfg. setGroup ( "Volume" );
   cfg. writeEntry ( entry, val );
 //  cfg. write ( );
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
   switch ( upd ) {
     case UPD_Vol: {
       QCopEnvelope ( "QPE/System", "volumeChange(bool)" ) << m_vol_muted;
       break;
     }
     case UPD_Mic: {
       QCopEnvelope ( "QPE/System", "micChange(bool)" ) << m_mic_muted;
       break;
     }
     case UPD_Bass: {
       QCopEnvelope ( "QPE/System", "bassChange(bool)" ) << true;
       break;
     }
     case UPD_Treble: {
       QCopEnvelope ( "QPE/System", "trebleChange(bool)" ) << true;
       break;
     }
 
     case UPD_None:
       break;
   }
 #endif
 }
 
 //===========================================================================
 
 VolumeApplet::VolumeApplet( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
   setFixedWidth ( AppLnk::smallIconSize()  );
   setFixedHeight ( AppLnk::smallIconSize()+4 );
 
   m_pixmap = new QPixmap ( Resource::loadPixmap ( "volume" ));
   m_dialog = new VolumeControl ( this, true, this, "volumecontrol" );
 
   connect ( qApp, SIGNAL( volumeChanged ( bool )), m_dialog, SLOT( volumeChanged( bool )));
   connect ( qApp, SIGNAL( micChanged ( bool )), m_dialog, SLOT ( micChanged( bool )));
 }
 
 VolumeApplet::~VolumeApplet()
 {
   delete m_pixmap;
 }
 
 
 void VolumeApplet::mousePressEvent ( QMouseEvent * )
 {
   if ( m_dialog-> isVisible ( ))
     m_dialog-> hide ( );
   else
     m_dialog-> show ( true );
 }
 
 void VolumeApplet::redraw ( bool all )
 {
         if ( all )
                 repaint ( true );
         else
                 repaint ( 2, height ( ) - 3, width ( ) - 4, 2, false );
 }
 
 
 void VolumeApplet::paintEvent ( QPaintEvent * )
 {
   QPainter p ( this );
 
-  p. drawPixmap ( 0, 1, *m_pixmap );
+  p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap );
   p. setPen ( darkGray );
   p. drawRect ( 1, height() - 4, width() - 2, 4 );
 
   int pixelsWide = m_dialog-> volPercent ( ) * ( width() - 4 ) / 100;
   p. fillRect ( 2, height() - 3, pixelsWide, 2, red );
   p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray );
 
   if ( m_dialog-> volMuted ( )) {
     p. setPen ( red );
     p. drawLine ( 1, 2, width() - 2, height() - 5 );
     p. drawLine ( 1, 3, width() - 2, height() - 4 );
     p. drawLine ( width() - 2, 2, 1, height() - 5 );
     p. drawLine ( width() - 2, 3, 1, height() - 4 );
   }
 }