summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-05-10 17:33:15 (UTC)
committer mickeyl <mickeyl>2003-05-10 17:33:15 (UTC)
commit797a10cb009d58366d8eb3e792e350f87be4d100 (patch) (side-by-side diff)
treea4225497e49f7c27bf6c80103db33375c1d27edf
parentd563040b1ccf4678f056626525d605e8bcba07ef (diff)
downloadopie-797a10cb009d58366d8eb3e792e350f87be4d100.zip
opie-797a10cb009d58366d8eb3e792e350f87be4d100.tar.gz
opie-797a10cb009d58366d8eb3e792e350f87be4d100.tar.bz2
fix battery status display which has been broken for weeks...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index fdd963c..a32a3a6 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -170,86 +170,86 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
text += tr("Low");
break;
case PowerStatus::VeryLow:
text += tr("Very Low");
break;
case PowerStatus::Critical:
text += tr("Critical");
break;
default: // NotPresent, etc.
text += tr("Unknown");
}
}
p.drawText( 10, 90, text );
if ( ps->acStatus() == PowerStatus::Backup )
p.drawText( 10, 110, tr("On backup power") );
else if ( ps->acStatus() == PowerStatus::Online )
p.drawText( 10, 110, tr("Power on-line") );
else if ( ps->acStatus() == PowerStatus::Offline )
p.drawText( 10, 110, tr("External power disconnected") );
if ( ps->batteryTimeRemaining() >= 0 ) {
text.sprintf( tr("Battery time remaining") + ": %im %02is",
ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
p.drawText( 10, 130, text );
}
QColor c;
QColor darkc;
QColor lightc;
if ( ps->acStatus() == PowerStatus::Offline ) {
c = blue.light(120);
darkc = c.dark(280);
lightc = c.light(145);
} 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 rightEnd1 = screenWidth - 47;
int rightEnd2 = screenWidth - 35;
- int percent2 = ( percent / 100 ) * rightEnd1 ;
+ int percent2 = ( percent / 100.0 ) * rightEnd1 ;
p.setPen( black );
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, 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");
}
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);
}
}