1 files changed, 12 insertions, 2 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 078ce8d..480d261 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -1,166 +1,176 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "battery.h"
 #include "batterystatus.h"
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/power.h>
 #include <qpe/qpeapplication.h>
 
 #include <qpainter.h>
 #include <qtimer.h>
 
 
 BatteryMeter::BatteryMeter( QWidget *parent )
     : QWidget( parent ), charging(false)
 {
     ps = new PowerStatus;
     startTimer( 10000 );
     setFixedHeight( AppLnk::smallIconSize() );
     chargeTimer = new QTimer( this );
     connect( chargeTimer, SIGNAL(timeout()), this, SLOT(chargeTimeout()) );
     timerEvent(0);
     QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold );
     Config c( "qpe" );
     c.setGroup( "Battery" );
     style = c.readNumEntry( "Style", 0 );
 }
 
 BatteryMeter::~BatteryMeter()
 {
     delete ps;
 }
 
 QSize BatteryMeter::sizeHint() const
 {
     return QSize(10, height() );
 }
 
 void BatteryMeter::mousePressEvent( QMouseEvent* e )
 {
     if ( e->button() == RightButton )
     {
         style = 1-style;
         Config c( "qpe" );
         c.setGroup( "Battery" );
         c.writeEntry( "Style", style );
         repaint( true );
     }
     QWidget::mousePressEvent( e );
 }
 
 void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
 {
     if ( batteryView && batteryView->isVisible() ) {
         delete (QWidget *) batteryView;
     } else {
         if ( !batteryView ) batteryView = new BatteryStatus( ps );
         batteryView->showMaximized();
         batteryView->raise();
         batteryView->show();
     }
 }
 
 void BatteryMeter::timerEvent( QTimerEvent * )
 {
     PowerStatus prev = *ps;
 
     *ps = PowerStatusManager::readStatus();
 
     if ( prev != *ps ) {
     percent = ps->batteryPercentRemaining();
     if ( !charging && ps->batteryStatus() == PowerStatus::Charging && percent < 0 ) {
         percent = 0;
         charging = true;
         chargeTimer->start( 500 );
     } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) {
         charging = false;
         chargeTimer->stop();
         if ( batteryView )
         batteryView->updatePercent( percent );
     }
     repaint( style != 0 );
     if ( batteryView )
         batteryView->repaint();
     }
 }
 
 void BatteryMeter::chargeTimeout()
 {
     percent += 20;
     if ( percent > 100 )
         percent = 0;
 
     repaint(FALSE);
     if ( batteryView )
         batteryView->updatePercent( percent );
 }
 
 void BatteryMeter::paintEvent( QPaintEvent* )
 {
     if ( style == 1 )
     {
         QPainter p(this);
         QFont f( "Fixed", AppLnk::smallIconSize()/2 );
         QFontMetrics fm( f );
         p.setFont( f );
-        p.drawText( 0, AppLnk::smallIconSize()/2, QString::number( percent ) );
-        p.drawText( AppLnk::smallIconSize()/4, AppLnk::smallIconSize(), "%" );
+        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(), "%" );
+        }
         return;
     }
 
     QPainter p(this);
     QColor color;
     QColor g = gray.light( 160 );
     switch ( ps->acStatus() )
     {
         case PowerStatus::Offline: color = blue.light( 150 ); break;
         case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break;
         default: color = red.light( 160 );
     }
 
     int w = height() / 2;
     if ( !(w%2) ) w--; // should have an odd value to get a real middle line
     int h = height() - 4;
     int pix = (percent * h) / 100;
     int y2 = height() -2;
     int y = y2 - pix;
     int x1 = (width() - w ) / 2;
 
     p.setPen(QColor(80,80,80));
     p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0);  // header
     p.drawRect(x1,1,w,height()-1);      // corpus
     p.setBrush(color);
 
     int extra = ((percent * h) % 100)/(100/4);
 
     int middle = w/2;
     for ( int i = 0; i < middle; i++ )
     {
         p.setPen( gray.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 );
         p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 );
         p.setPen( color.dark( 100+i*20 ) );
         p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
         p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
     }
 }