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
@@ -119,24 +119,14 @@ void BatteryMeter::paintEvent( QPaintEvent* )
     if ( style == 1 )
     {
         QPainter p(this);
         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;
     }
 
     QPainter p(this);
     QColor color;
     QColor g = gray.light( 160 );
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
@@ -237,13 +237,13 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
           jacketMsg = tr("Jacket  " + jackChem);
       } else {
           jackPercent = 0;
           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);
       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 );