summaryrefslogtreecommitdiff
path: root/core/applets/batteryapplet
authorkergoth <kergoth>2003-08-09 17:29:36 (UTC)
committer kergoth <kergoth>2003-08-09 17:29:36 (UTC)
commita0bab0e281fbaf6f6ebbb1a48e5c06426bfbbb93 (patch) (side-by-side diff)
tree5ce78e1a5dedd31b7851d53bf9f072bd44edd1b0 /core/applets/batteryapplet
parenta7e015198a8c5ad3b6e144a9032b059086253e00 (diff)
downloadopie-a0bab0e281fbaf6f6ebbb1a48e5c06426bfbbb93.zip
opie-a0bab0e281fbaf6f6ebbb1a48e5c06426bfbbb93.tar.gz
opie-a0bab0e281fbaf6f6ebbb1a48e5c06426bfbbb93.tar.bz2
Merge from BRANCH_1_0
Diffstat (limited to 'core/applets/batteryapplet') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp14
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp2
2 files changed, 3 insertions, 13 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 480d261..078ce8d 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -122,18 +122,8 @@ void BatteryMeter::paintEvent( QPaintEvent* )
QFont f( "Fixed", AppLnk::smallIconSize()/2 );
QFontMetrics fm( f );
p.setFont( f );
- if ( percent > 98 ) {
- p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "F" ) );
- }
- else if ( percent < 5 )
- {
- p.drawText( 0, 0, width(), height(), Qt::AlignCenter, tr( "E" ) );
- }
- else
- {
- p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
- p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
- }
+ p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
+ p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
return;
}
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 092a48d..5936b5d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -240,7 +240,7 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
jacketMsg = tr("No jacket with battery inserted");
}
- int jackPerc = ( jackPercent / 100.0 ) * screenWidth - 47;
+ int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL);