-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 43 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.h | 2 |
2 files changed, 33 insertions, 12 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 7d3bdd9..fdd963c 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -1,35 +1,46 @@ #include "batterystatus.h" #include <qpe/power.h> #include <opie/odevice.h> #include <qpainter.h> #include <qpushbutton.h> #include <qdrawutil.h> #include <qfile.h> +#include <qlayout.h> #include <qtextstream.h> +#include <qapplication.h> #include <qmessagebox.h> using namespace Opie; BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { setCaption( tr("Battery status") ); QPushButton *pb = new QPushButton( tr("Close"), this ); - pb->move( 70, 250 ); - pb->setMaximumHeight(20); + QVBoxLayout *layout = new QVBoxLayout ( this ); + + jackPercent = 0; + + pb->setMaximumHeight(40); + pb->setMaximumWidth( 120 ); + pb->show(); + + layout->addStretch( 0 ); + layout->addWidget( pb ); + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { getProcApmStatusIpaq(); } connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); percent = ps->batteryPercentRemaining(); show(); } BatteryStatus::~BatteryStatus() { } @@ -126,24 +137,28 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg p->setPen( highlight ); p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j ); } for ( int j = 0; j < ng-hy-hh; j++ ) { p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1), v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) ); p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j ); } } void BatteryStatus::paintEvent( QPaintEvent * ) { + + int screenWidth = qApp->desktop()->width(); + int screenHeight = qApp->desktop()->height(); + QPainter p(this); QString text; if ( ps->batteryStatus() == PowerStatus::Charging ) { if (bat2) { text = tr("Charging both devices"); } else { text = tr("Charging"); } } else if ( ps->batteryPercentAccurate() ) { text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent ); } else { text = tr("Battery status: "); @@ -189,48 +204,52 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { } else if ( ps->acStatus() == PowerStatus::Online ) { c = green.dark(130); darkc = c.dark(200); lightc = c.light(220); } else { c = red; darkc = c.dark(280); lightc = c.light(140); } if ( percent < 0 ) return; - int percent2 = percent * 2; + int rightEnd1 = screenWidth - 47; + int rightEnd2 = screenWidth - 35; + int percent2 = ( percent / 100 ) * rightEnd1 ; p.setPen( black ); - qDrawShadePanel( &p, 9, 30, 204, 39, colorGroup(), TRUE, 1, NULL); - qDrawShadePanel( &p, 212, 37, 12, 24, colorGroup(), TRUE, 1, NULL); + qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); + qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); - drawSegment( &p, QRect( 11 + percent2, 30, 200 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); - drawSegment( &p, QRect( 212, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); + drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); + drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); p.setPen( black); if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { p.drawText(15, 50, tr ("Ipaq " + ipaqChem)); QString jacketMsg; if (bat2) { p.setPen(black); p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus); p.drawText(10,240, tr("Battery time remaining: ") + sec2); jacketMsg = tr("Jacket " + jackChem); } else { jackPercent = 0; jacketMsg = tr("No jacket with battery inserted"); } - qDrawShadePanel( &p, 9, 160, 204, 39, colorGroup(), TRUE, 1, NULL); - qDrawShadePanel( &p, 212, 167, 12, 24, colorGroup(), TRUE, 1, NULL); - drawSegment( &p, QRect( 10, 160, jackPercent*2, 40 ), lightc, darkc, lightc.light(115), 6 ); - drawSegment( &p, QRect( 11 + jackPercent*2, 160, 200 - jackPercent*2, 40 ), white.light(80), black, white.light(90), 6 ); - drawSegment( &p, QRect( 212, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); + int jackPerc = ( jackPercent / 100 ) * screenWidth - 47; + + qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); + qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL); + drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); + drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 ); + drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); p.setPen( black ); p.drawText(15, 180, jacketMsg); } } diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h index 18c2943..a5ab804 100644 --- a/core/applets/batteryapplet/batterystatus.h +++ b/core/applets/batteryapplet/batterystatus.h @@ -43,16 +43,18 @@ private: int ipaqPercent; int jackPercent; int jackMinutes; QString perc1; QString sec1; QString perc2; QString sec2; QString ipaqStatus; QString jackStatus; QString ipaqChem; QString jackChem; bool bat2; + int screenWidth; + int screenHeight; }; #endif |