summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -31,13 +31,16 @@
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" );
@@ -48,13 +51,13 @@ 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 )
{
@@ -113,20 +116,21 @@ void BatteryMeter::chargeTimeout()
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 );
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
@@ -32,15 +32,19 @@
//===========================================================================
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 ( )));
@@ -137,13 +141,15 @@ 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 ( )
{
static bool 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
@@ -312,13 +312,13 @@ 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
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
@@ -17,12 +17,14 @@
** not clear to you.
**
**********************************************************************/
#ifndef IRDAAPPLETIMPL_H
#define IRDAAPPLETIMPL_H
+#include <qwidget.h>
+
#include <qpe/taskbarappletinterface.h>
class IrdaApplet;
class IrdaAppletImpl : public TaskbarAppletInterface
{
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
@@ -31,12 +31,14 @@
#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:
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
@@ -760,13 +760,13 @@ void VolumeApplet::redraw ( bool all )
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 );