summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-01-04 13:43:40 (UTC)
committer harlekin <harlekin>2004-01-04 13:43:40 (UTC)
commit84f039ef3799c5310a4f94057b9d76d4ee55f499 (patch) (side-by-side diff)
treed53ec9b3444dd338697f4ca0dd43605a499fc477
parent8810bf223d97a98bfb746c0571ba1640c4351e8e (diff)
downloadopie-84f039ef3799c5310a4f94057b9d76d4ee55f499.zip
opie-84f039ef3799c5310a4f94057b9d76d4ee55f499.tar.gz
opie-84f039ef3799c5310a4f94057b9d76d4ee55f499.tar.bz2
patch by Brad Campbell <brad@wasp.net.au>, show charging info correct again, thanks
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 15eb762..4adcab4 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -87,13 +87,13 @@ void BatteryMeter::timerEvent( QTimerEvent * )
PowerStatus prev = *ps;
*ps = PowerStatusManager::readStatus();
if ( prev != *ps ) {
percent = ps->batteryPercentRemaining();
- if ( !charging && ps->batteryStatus() == PowerStatus::Charging && percent < 0 ) {
+ if ( !charging && ps->batteryStatus() == PowerStatus::Charging ) {
percent = 0;
charging = true;
chargeTimer->start( 500 );
} else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) {
charging = false;
chargeTimer->stop();
@@ -116,13 +116,13 @@ void BatteryMeter::chargeTimeout()
if ( batteryView )
batteryView->updatePercent( percent );
}
void BatteryMeter::paintEvent( QPaintEvent* )
{
- qWarning("paint");
+
if ( style == 1 )
{
QPainter p(this);
QFont f( "Fixed", AppLnk::smallIconSize()/2 );
QFontMetrics fm( f );
p.setFont( f );