summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp10
-rw-r--r--core/applets/clipboardapplet/clipboard.cpp14
-rw-r--r--core/applets/irdaapplet/irda.cpp2
-rw-r--r--core/applets/irdaapplet/irdaappletimpl.h2
-rw-r--r--core/applets/rotateapplet/rotate.h2
-rw-r--r--core/applets/volumeapplet/volume.cpp2
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 )
34{ 34{
35 ps = new PowerStatus; 35 ps = new PowerStatus;
36 startTimer( 10000 ); 36 startTimer( 10000 );
37
38 setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) );
37 setFixedHeight( AppLnk::smallIconSize() ); 39 setFixedHeight( AppLnk::smallIconSize() );
40
38 chargeTimer = new QTimer( this ); 41 chargeTimer = new QTimer( this );
39 connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); 42 connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) );
40 timerEvent(0); 43 timerEvent(0);
@@ -51,7 +54,7 @@ BatteryMeter::~BatteryMeter()
51 54
52QSize BatteryMeter::sizeHint() const 55QSize BatteryMeter::sizeHint() const
53{ 56{
54 return QSize(10, height() ); 57 return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() );
55} 58}
56 59
57void BatteryMeter::mousePressEvent( QMouseEvent* e ) 60void BatteryMeter::mousePressEvent( QMouseEvent* e )
@@ -116,14 +119,15 @@ void BatteryMeter::chargeTimeout()
116 119
117void BatteryMeter::paintEvent( QPaintEvent* ) 120void BatteryMeter::paintEvent( QPaintEvent* )
118{ 121{
122 qWarning("paint");
119 if ( style == 1 ) 123 if ( style == 1 )
120 { 124 {
121 QPainter p(this); 125 QPainter p(this);
122 QFont f( "Fixed", AppLnk::smallIconSize()/2 ); 126 QFont f( "Fixed", AppLnk::smallIconSize()/2 );
123 QFontMetrics fm( f ); 127 QFontMetrics fm( f );
124 p.setFont( f ); 128 p.setFont( f );
125 p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) ); 129 p.drawText( 0, height()/2, QString::number( percent ) );
126 p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" ); 130 p.drawText( width()/4, height(), "%" );
127 return; 131 return;
128 } 132 }
129 133
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 @@
35 35
36ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) 36ClipboardApplet::ClipboardApplet( QWidget *parent, const char *name ) : QWidget( parent, name )
37{ 37{
38 setFixedWidth ( AppLnk::smallIconSize() ); 38 setFixedWidth ( AppLnk::smallIconSize() );
39 setFixedHeight ( AppLnk::smallIconSize() ); 39 setFixedHeight ( AppLnk::smallIconSize() );
40 m_clipboardPixmap = QPixmap ( Resource::loadPixmap( "paste" ) ); 40
41 QImage img = Resource::loadImage( "paste");
42 img = img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
43
44 m_clipboardPixmap.convertFromImage( img );
41 45
42 m_timer = new QTimer ( this ); 46 m_timer = new QTimer ( this );
43 47
@@ -140,7 +144,9 @@ void ClipboardApplet::action(int id)
140void ClipboardApplet::paintEvent ( QPaintEvent* ) 144void ClipboardApplet::paintEvent ( QPaintEvent* )
141{ 145{
142 QPainter p ( this ); 146 QPainter p ( this );
143 p. drawPixmap( 0, 1, m_clipboardPixmap ); 147 /* center the height but our pixmap is as big as the height ;)*/
148 p. drawPixmap( 0, 0,
149 m_clipboardPixmap );
144} 150}
145 151
146void ClipboardApplet::newData ( ) 152void 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 * )
315 p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); 315 p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap );
316 316
317 if ( m_irda_discovery_active ) 317 if ( m_irda_discovery_active )
318 p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); 318 p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap );
319 319
320 if ( m_receive_active ) 320 if ( m_receive_active )
321 p. drawPixmap( 0, 1, m_receiveActivePixmap ); 321 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 @@
20#ifndef IRDAAPPLETIMPL_H 20#ifndef IRDAAPPLETIMPL_H
21#define IRDAAPPLETIMPL_H 21#define IRDAAPPLETIMPL_H
22 22
23#include <qwidget.h>
24
23#include <qpe/taskbarappletinterface.h> 25#include <qpe/taskbarappletinterface.h>
24 26
25class IrdaApplet; 27class 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 @@
34#include <qpe/menuappletinterface.h> 34#include <qpe/menuappletinterface.h>
35#include <qobject.h> 35#include <qobject.h>
36 36
37#include <qobject.h>
38
37class RotateApplet : public QObject, public MenuAppletInterface 39class RotateApplet : public QObject, public MenuAppletInterface
38{ 40{
39 41
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 * )
763{ 763{
764 QPainter p ( this ); 764 QPainter p ( this );
765 765
766 p. drawPixmap ( 0, 1, *m_pixmap ); 766 p. drawPixmap ( (width()- m_pixmap->width())/2, QMAX( (height()-4-m_pixmap->height() )/2, 1), *m_pixmap );
767 p. setPen ( darkGray ); 767 p. setPen ( darkGray );
768 p. drawRect ( 1, height() - 4, width() - 2, 4 ); 768 p. drawRect ( 1, height() - 4, width() - 2, 4 );
769 769