author | mickeyl <mickeyl> | 2004-12-20 11:41:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-12-20 11:41:40 (UTC) |
commit | a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f (patch) (side-by-side diff) | |
tree | 4aaba66624f01f2df74bccd7336fa5d9c77cb5a4 | |
parent | 9f8a51344b8324a6d093b56b75ca22802ea8818e (diff) | |
download | opie-a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f.zip opie-a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f.tar.gz opie-a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f.tar.bz2 |
use less wide messages
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 860db64..f27543c 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -94,135 +94,135 @@ bool BatteryStatus::getProcApmStatusIpaq() { } if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { sec2 = tr("no data"); } else { sec2 += " min"; } jackStatus == (" ( " + jackStatus + " )"); return true; } void BatteryStatus::updatePercent( int pc ) { percent = pc; repaint(FALSE); } void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) { int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height; topgrad.hsv( &h1, &s1, &v1 ); botgrad.hsv( &h2, &s2, &v2 ); for ( int j = 0; j < hy-2; 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-2-j, r.x()+r.width(), r.top()+hy-2-j ); } for ( int j = 0; j < hh; j++ ) { 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 ); } } QString BatteryStatus::statusText() const { 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 ); + text.sprintf( tr("Remaining Power") + ": %i%%", percent ); } else { text = tr("Battery status: "); switch ( ps->batteryStatus() ) { case PowerStatus::High: text += tr("Good"); break; case PowerStatus::Low: 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"); } } if ( ps->acStatus() == PowerStatus::Backup ) text += "\n" + tr("On backup power"); else if ( ps->acStatus() == PowerStatus::Online ) - text += "\n" + tr("Power on-line"); - else if ( ps->acStatus() == PowerStatus::Offline ) - text += "\n" + tr("External power disconnected"); + text += "\n" + tr("Power on-line"); + else if ( ps->acStatus() == PowerStatus::Offline ) + text += "\n" + tr("External power disconnected"); - if ( ps->batteryTimeRemaining() >= 0 ) { - text += "\n" + QString().sprintf( tr("Battery time remaining") + ": %im %02is", - ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); - } + if ( ps->batteryTimeRemaining() >= 0 ) { + text += "\n" + QString().sprintf( tr("Remaining Time") + ": %im %02is", + ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); + } return text; } QString BatteryStatus::statusTextIpaq() const { QString text; - text += tr("Percentage battery remaining: ") + perc2 + " " + jackStatus; - text += "\n" + tr("Battery time remaining: ") + sec2; + text += tr("Remaining Power: ") + perc2 + " " + jackStatus; + text += "\n" + tr("Remaining Time: ") + sec2; return text; } void BatteryStatus::paintEvent( QPaintEvent * ev ) { QPainter p( this ); QString text = statusText(); p.drawText( 10, 50, width() - 20, 40 , AlignVCenter, 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 = width() - 47; int rightEnd2 = width() - 35; int percent2 = (percent * rightEnd1) / 100; p.setPen( black ); qDrawShadePanel( &p, 9, 10, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); qDrawShadePanel( &p, rightEnd2, 17, 12, 24, colorGroup(), TRUE, 1, NULL); drawSegment( &p, QRect( 10, 10, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); drawSegment( &p, QRect( 11 + percent2, 10, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); drawSegment( &p, QRect( rightEnd2, 17, 10, 25 ), white.light(80), black, white.light(90), 2 ); p.setPen( black); if ( ODevice::inst ( )-> series ( ) == Model_iPAQ && bat2 ) { p.drawText( 15, 30, tr ("Ipaq ") + ipaqChem ); QString jacketMsg; if (bat2) { p.setPen(black); QString text = statusTextIpaq(); |