| -rw-r--r-- | core/applets/batteryapplet/battery.cpp | 2 | ||||
| -rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index e85a9da..fa95b2b 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -133,4 +133,6 @@ void BatteryMeter::paintEvent( QPaintEvent* ) { QFont f( "Fixed", AppLnk::smallIconSize()/2 ); QFontMetrics fm( f ); + //Avoid text overlapping + p.eraseRect( 0, 0, 20, 20 ); p.setFont( f ); p.drawText( 0, height()/2, QString::number( percent ) ); diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 7f8de2c..34043f4 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -49,4 +49,6 @@ bool BatteryStatus::getProcApmStatusIpaq() { streamIn = stream.read(); list = QStringList::split("\n", streamIn); + + sec2 = sec1 = ""; for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { @@ -88,5 +90,5 @@ bool BatteryStatus::getProcApmStatusIpaq() { ipaqPercent = perc1.toInt(); - if (perc2.isEmpty()) { + if (perc2.isEmpty() || perc2 == "unknow" ) { perc2 = tr("no data"); } else { @@ -191,5 +193,5 @@ QString BatteryStatus::statusText() const { QString BatteryStatus::statusTextIpaq() const { - QString text = tr( "Remaing Power: %1 %2\nRemaining Time: %3" ).arg( perc2 ) + QString text = tr( "Remaining Power: %1 \n%2\nRemaining Time: %3" ).arg( perc2 ) .arg( jackStatus ) .arg( sec2 ); @@ -204,4 +206,5 @@ void BatteryStatus::paintEvent( QPaintEvent * ev ) { QString text = statusText(); + p.eraseRect( p.boundingRect( 10, 50, width() - 20, 40 , AlignVCenter, text ) ); p.drawText( 10, 50, width() - 20, 40 , AlignVCenter, text ); @@ -244,5 +247,6 @@ void BatteryStatus::paintEvent( QPaintEvent * ev ) { p.setPen(black); QString text = statusTextIpaq(); - p.drawText( 10, 150, text ); + p.eraseRect( p.boundingRect( 10, 130, width() - 20, 40 , AlignVCenter, text ) ); + p.drawText( 10, 130, width() - 20, 40 , AlignVCenter, text ); jacketMsg = tr("Jacket ").arg( jackChem ); } else { @@ -273,5 +277,5 @@ QSize BatteryStatus::sizeHint() const { if ( bat2 ) { return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ), - r.width()+2*10 ), 2 * 10 + 80 + r.height() + r2.height() ); + r.width()+2*10 ), 2 * 10 + 100 + r.height() + r2.height() ); } return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ), |