| -rw-r--r-- | core/applets/batteryapplet/battery.cpp | 93 | ||||
| -rw-r--r-- | core/applets/batteryapplet/battery.h | 2 |
2 files changed, 55 insertions, 40 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index f3a95ed..eee3ed3 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -7,67 +7,85 @@ ** 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/power.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 ); 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() ); } -void BatteryMeter::mouseReleaseEvent( QMouseEvent *) +void BatteryMeter::mousePressEvent( QMouseEvent* e ) +{ + if ( e->button() == RightButton ) + { + style = 1-style; + Config c( "qpe" ); + c.setGroup( "Battery" ); + c.writeEntry( "Style", style ); + repaint(); + } + QWidget::mousePressEvent( e ); +} + +void BatteryMeter::mouseReleaseEvent( QMouseEvent* e) { if ( batteryView && batteryView->isVisible() ) { delete (QWidget *) batteryView; } else { - if ( !batteryView ) - batteryView = new BatteryStatus( ps ); + 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; @@ -85,69 +103,64 @@ void BatteryMeter::timerEvent( QTimerEvent * ) } } void BatteryMeter::chargeTimeout() { percent += 20; if ( percent > 100 ) percent = 0; repaint(FALSE); if ( batteryView ) batteryView->updatePercent( percent ); } void BatteryMeter::paintEvent( QPaintEvent* ) { + 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(), "%" ); + return; + } - QColor c; - QColor darkc; - QColor lightc; - if ( ps->acStatus() == PowerStatus::Offline ) { - c = blue.light(120); - 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); + 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,0); - p.drawRect(x1,1,w,height()-1); - p.setBrush(c); + 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); -#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); } - p.setPen( c ); - DRAW(1); - DRAW(3); - p.setPen( lightc ); - DRAW(2); - p.setPen(darkc); - DRAW(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/batteryapplet/battery.h b/core/applets/batteryapplet/battery.h index d4807b0..c2d1216 100644 --- a/core/applets/batteryapplet/battery.h +++ b/core/applets/batteryapplet/battery.h @@ -26,30 +26,32 @@ class PowerStatus; class BatteryStatus; class QTimer; class BatteryMeter : public QWidget { Q_OBJECT public: BatteryMeter( QWidget *parent = 0 ); ~BatteryMeter(); QSize sizeHint() const; protected: void timerEvent( QTimerEvent * ); void paintEvent( QPaintEvent* ); + void mousePressEvent( QMouseEvent* ); void mouseReleaseEvent( QMouseEvent * ); protected slots: void chargeTimeout(); protected: QGuardedPtr<BatteryStatus> batteryView; PowerStatus *ps; QTimer *chargeTimer; int percent; bool charging; + int style; }; #endif |