summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-12-20 11:41:40 (UTC)
committer mickeyl <mickeyl>2004-12-20 11:41:40 (UTC)
commita226cb8cc1ff4f81d43c0c8ecafca889ba817f9f (patch) (side-by-side diff)
tree4aaba66624f01f2df74bccd7336fa5d9c77cb5a4
parent9f8a51344b8324a6d093b56b75ca22802ea8818e (diff)
downloadopie-a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f.zip
opie-a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f.tar.gz
opie-a226cb8cc1ff4f81d43c0c8ecafca889ba817f9f.tar.bz2
use less wide messages
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp8
1 files changed, 4 insertions, 4 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
@@ -130,25 +130,25 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
}
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;
@@ -159,34 +159,34 @@ QString BatteryStatus::statusText() const {
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");
if ( ps->batteryTimeRemaining() >= 0 ) {
- text += "\n" + QString().sprintf( tr("Battery time remaining") + ": %im %02is",
+ 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;