the "bett ery" commit, batteryapplet is now a popup, only shows second battery on ipaq if a second battery is present

1 files changed, 8 insertions, 4 deletions

diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h
index a5ab804..bb95ece 100644
--- a/core/applets/batteryapplet/batterystatus.h
+++ b/core/applets/batteryapplet/batterystatus.h
@@ -22,3 +22,3 @@
 
-#include <qwidget.h>
+#include <qframe.h>
 
@@ -26,3 +26,3 @@ class PowerStatus;
 
-class BatteryStatus : public QWidget
+class BatteryStatus : public QFrame
 {
@@ -30,3 +30,3 @@ class BatteryStatus : public QWidget
 public:
-    BatteryStatus( const PowerStatus *s, QWidget *parent=0 );
+    BatteryStatus( const PowerStatus *s, QWidget *parent=0, WFlags f = 0 );
     ~BatteryStatus();
@@ -34,3 +34,3 @@ public:
     void updatePercent( int );
-
+    QSize sizeHint() const;
 protected:
@@ -39,3 +39,6 @@ protected:
     bool BatteryStatus::getProcApmStatusIpaq();
+
 private:
+    QString  statusText() const;
+    QString  statusTextIpaq() const;
     const PowerStatus *ps;
@@ -54,2 +57,3 @@ private:
     bool bat2;
+    bool bat2inserted;
     int screenWidth;