From bc5c0b3549d43f7e04a06049578c5413dbf0c00b Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 24 Jun 2004 09:13:31 +0000 Subject: Battery status panel was only updating once when it was created, after this it was being hidden and re-shown without updating the data. Now it is updated every time it is shown. --- (limited to 'core/applets/batteryapplet') diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 0d3d190..e85a9da 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -79,6 +79,7 @@ void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ ) { batteryView->setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); } + batteryView->UpdateBatteryStatus(); QRect r(batteryView->pos(),batteryView->sizeHint()); QPoint curPos = this->mapToGlobal ( rect().topLeft() ); diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 5a24b94..860db64 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -17,16 +17,21 @@ using namespace Opie::Core; BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent, WFlags f ) : QFrame( parent, 0, f), ps(p), bat2(false) { - jackPercent = 0; - - if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { - getProcApmStatusIpaq(); - } - percent = ps->batteryPercentRemaining(); + UpdateBatteryStatus(); } BatteryStatus::~BatteryStatus() {} +void BatteryStatus::UpdateBatteryStatus() { + + jackPercent = 0; + + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { + getProcApmStatusIpaq(); + } + percent = ps->batteryPercentRemaining(); +} + /* * Make use of the advanced apm interface of the ipaq */ diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h index bb95ece..4da446d 100644 --- a/core/applets/batteryapplet/batterystatus.h +++ b/core/applets/batteryapplet/batterystatus.h @@ -30,7 +30,7 @@ class BatteryStatus : public QFrame public: BatteryStatus( const PowerStatus *s, QWidget *parent=0, WFlags f = 0 ); ~BatteryStatus(); - + void BatteryStatus::UpdateBatteryStatus(); void updatePercent( int ); QSize sizeHint() const; protected: -- cgit v0.9.0.2