Fix bugs #1384 and #1546

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
@@ -134,2 +134,4 @@ void BatteryMeter::paintEvent( QPaintEvent* ) {
         QFontMetrics fm( f );
+        //Avoid text overlapping
+        p.eraseRect( 0, 0, 20, 20 );
         p.setFont( f );
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
@@ -50,2 +50,4 @@ bool BatteryStatus::getProcApmStatusIpaq() {
         list = QStringList::split("\n", streamIn);
+       
+        sec2 = sec1 = "";
 
@@ -89,3 +91,3 @@ bool BatteryStatus::getProcApmStatusIpaq() {
 
-    if (perc2.isEmpty()) {
+    if (perc2.isEmpty() || perc2 == "unknow" ) {
         perc2 = tr("no data");
@@ -192,3 +194,3 @@ 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 )
@@ -205,2 +207,3 @@ 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 );
@@ -245,3 +248,4 @@ void BatteryStatus::paintEvent( QPaintEvent * ev ) {
             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 );
@@ -274,3 +278,3 @@ QSize BatteryStatus::sizeHint() const {
     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() );
     }