Diffstat (limited to 'core/applets/batteryapplet/battery.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 3b329c6..f3a95ed 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -12,48 +12,49 @@ ** 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/power.h> +#include <qpe/applnk.h> #include <qpainter.h> #include <qtimer.h> BatteryMeter::BatteryMeter( QWidget *parent ) : QWidget( parent ), charging(false) { ps = new PowerStatus; startTimer( 10000 ); - setFixedHeight(12); + setFixedHeight( AppLnk::smallIconSize() ); chargeTimer = new QTimer( this ); connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) ); timerEvent(0); } BatteryMeter::~BatteryMeter() { delete ps; } QSize BatteryMeter::sizeHint() const { - return QSize(10,12); + return QSize(10, height() ); } void BatteryMeter::mouseReleaseEvent( QMouseEvent *) { if ( batteryView && batteryView->isVisible() ) { delete (QWidget *) batteryView; } else { if ( !batteryView ) batteryView = new BatteryStatus( ps ); batteryView->showMaximized(); batteryView->raise(); batteryView->show(); @@ -107,46 +108,46 @@ void BatteryMeter::paintEvent( QPaintEvent* ) darkc = c.dark(120); lightc = c.light(140); } else if ( ps->acStatus() == PowerStatus::Online ) { c = green.dark(130); darkc = c.dark(120); lightc = c.light(180); } else { c = red; darkc = c.dark(120); lightc = c.light(160); } - int w = 6; - int h = height()-3; + int w = height() / 2 ; + int h = height() - 4; int pix = (percent * h) / 100; - int y2 = height() - 2; + int y2 = height() -2; int y = y2 - pix; - int x1 = (width() - w) / 2; + int x1 = (width() - w ) / 2; p.setPen(QColor(80,80,80)); p.drawLine(x1+w/4,0,x1+w/4+w/2,0); p.drawRect(x1,1,w,height()-1); p.setBrush(c); int extra = ((percent * h) % 100)/(100/4); #define Y(i) ((i<=extra)?y-1:y) #define DRAWUPPER(i) if ( Y(i) >= 2 ) p.drawLine(i+x1,2,i+x1,Y(i)); p.setPen( gray ); DRAWUPPER(1); DRAWUPPER(3); p.setPen( gray.light(130) ); DRAWUPPER(2); p.setPen( gray.dark(120) ); DRAWUPPER(4); -#define DRAW(i) { if ( Y(i) < y2 ) p.drawLine(i+x1,Y(i)+1,i+x1,y2); } +#define DRAW(i) { if ( Y(i) < y2 ) p.drawLine(i+x1,Y(i)+1, i+x1,y2); } p.setPen( c ); DRAW(1); DRAW(3); p.setPen( lightc ); DRAW(2); p.setPen(darkc); DRAW(4); } |