| -rw-r--r-- | core/applets/batteryapplet/battery.cpp | 10 | ||||
| -rw-r--r-- | core/applets/clipboardapplet/clipboard.cpp | 14 | ||||
| -rw-r--r-- | core/applets/irdaapplet/irda.cpp | 2 | ||||
| -rw-r--r-- | core/applets/irdaapplet/irdaappletimpl.h | 2 | ||||
| -rw-r--r-- | core/applets/rotateapplet/rotate.h | 2 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volume.cpp | 2 |
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 @@ -34,7 +34,10 @@ BatteryMeter::BatteryMeter( QWidget *parent ) { 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); @@ -51,7 +54,7 @@ BatteryMeter::~BatteryMeter() QSize BatteryMeter::sizeHint() const { - return QSize(10, height() ); + return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() ); } void BatteryMeter::mousePressEvent( QMouseEvent* e ) @@ -116,14 +119,15 @@ void BatteryMeter::chargeTimeout() 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; } 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 @@ -35,9 +35,13 @@ 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 ); @@ -140,7 +144,9 @@ void ClipboardApplet::action(int id) 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 ( ) 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 @@ -315,7 +315,7 @@ void IrdaApplet::paintEvent ( QPaintEvent * ) 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 ); 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 @@ -20,6 +20,8 @@ #ifndef IRDAAPPLETIMPL_H #define IRDAAPPLETIMPL_H +#include <qwidget.h> + #include <qpe/taskbarappletinterface.h> class IrdaApplet; 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 @@ -34,6 +34,8 @@ #include <qpe/menuappletinterface.h> #include <qobject.h> +#include <qobject.h> + class RotateApplet : public QObject, public MenuAppletInterface { 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 @@ -763,7 +763,7 @@ 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 ); |