summaryrefslogtreecommitdiff
path: root/core/applets/batteryapplet/batterystatus.cpp
Side-by-side diff
Diffstat (limited to 'core/applets/batteryapplet/batterystatus.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp103
1 files changed, 54 insertions, 49 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index ab8f36d..655fdc4 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -10,5 +10,4 @@
#include <qdrawutil.h>
#include <qfile.h>
-#include <qlayout.h>
#include <qtextstream.h>
#include <qmessagebox.h>
@@ -16,32 +15,16 @@
using namespace Opie::Core;
-BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
- : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
- setCaption( tr("Battery status") );
- setMinimumSize( 150, 200 );
-
- QPushButton *pb = new QPushButton( tr("Close"), this );
- QVBoxLayout *layout = new QVBoxLayout ( this );
+BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent, WFlags f )
+: QFrame( parent, 0, f), ps(p), bat2(false) {
jackPercent = 0;
- pb->setMaximumSize( 120, 40 );
-
- pb->show();
-
- layout->addStretch();
- layout->addWidget( pb );
-
if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
getProcApmStatusIpaq();
}
- connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) );
percent = ps->batteryPercentRemaining();
- show();
}
-BatteryStatus::~BatteryStatus()
-{
-}
+BatteryStatus::~BatteryStatus() {}
/*
@@ -97,5 +80,4 @@ bool BatteryStatus::getProcApmStatusIpaq() {
procApmIpaq.close();
-
jackPercent = perc2.toInt();
ipaqPercent = perc1.toInt();
@@ -107,5 +89,4 @@ bool BatteryStatus::getProcApmStatusIpaq() {
}
-
if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
sec2 = tr("no data");
@@ -115,5 +96,4 @@ bool BatteryStatus::getProcApmStatusIpaq() {
jackStatus == (" ( " + jackStatus + " )");
-
return true;
}
@@ -145,8 +125,7 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
}
-void BatteryStatus::paintEvent( QPaintEvent * ) {
-
- QPainter p(this);
+QString BatteryStatus::statusText() const {
QString text;
+
if ( ps->batteryStatus() == PowerStatus::Charging ) {
if (bat2) {
@@ -176,18 +155,32 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
}
}
- p.drawText( 10, 90, text );
if ( ps->acStatus() == PowerStatus::Backup )
- p.drawText( 10, 110, tr("On backup power") );
+ text += "\n" + tr("On backup power");
else if ( ps->acStatus() == PowerStatus::Online )
- p.drawText( 10, 110, tr("Power on-line") );
+ text += "\n" + tr("Power on-line");
else if ( ps->acStatus() == PowerStatus::Offline )
- p.drawText( 10, 110, tr("External power disconnected") );
+ text += "\n" + tr("External power disconnected");
if ( ps->batteryTimeRemaining() >= 0 ) {
- text.sprintf( tr("Battery time remaining") + ": %im %02is",
+ text += "\n" + QString().sprintf( tr("Battery time remaining") + ": %im %02is",
ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
- p.drawText( 10, 130, text );
}
+ return text;
+}
+
+QString BatteryStatus::statusTextIpaq() const {
+ QString text;
+ text += tr("Percentage battery remaining: ") + perc2 + " " + jackStatus;
+ text += "\n" + tr("Battery time remaining: ") + sec2;
+ return text;
+}
+
+void BatteryStatus::paintEvent( QPaintEvent * ) {
+
+ QPainter p( this );
+
+ QString text = statusText();
+ p.drawText( 10, 50, width() - 20, 40 , AlignVCenter, text );
QColor c;
@@ -214,21 +207,20 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
int percent2 = (percent * rightEnd1) / 100;
p.setPen( black );
- qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
- qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL);
- drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
- drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
- drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
+ qDrawShadePanel( &p, 9, 10, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
+ qDrawShadePanel( &p, rightEnd2, 17, 12, 24, colorGroup(), TRUE, 1, NULL);
+ drawSegment( &p, QRect( 10, 10, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
+ drawSegment( &p, QRect( 11 + percent2, 10, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
+ drawSegment( &p, QRect( rightEnd2, 17, 10, 25 ), white.light(80), black, white.light(90), 2 );
p.setPen( black);
+ if ( ODevice::inst ( )-> series ( ) == Model_iPAQ && bat2 ) {
- if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
-
- p.drawText(15, 50, tr ("Ipaq ") + ipaqChem);
+ p.drawText( 15, 30, tr ("Ipaq ") + ipaqChem );
QString jacketMsg;
if (bat2) {
p.setPen(black);
- p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
- p.drawText(10,240, tr("Battery time remaining: ") + sec2);
+ QString text = statusTextIpaq();
+ p.drawText( 10, 150, text );
jacketMsg = tr("Jacket ") + jackChem;
} else {
@@ -239,13 +231,26 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100;
- qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
- qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL);
- drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
- drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
- drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
+ qDrawShadePanel( &p, 9, 90, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
+ qDrawShadePanel( &p, rightEnd2, 97, 12, 24, colorGroup(), TRUE, 1, NULL);
+ drawSegment( &p, QRect( 10, 90, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
+ drawSegment( &p, QRect( 11 + jackPerc, 90, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
+ drawSegment( &p, QRect( rightEnd2, 97, 10, 25 ), white.light(80), black, white.light(90), 2 );
p.setPen( black );
- p.drawText(15, 180, jacketMsg);
+ p.drawText(15, 100, width() - 20, 20 , AlignVCenter, jacketMsg);
}
-
}
+QSize BatteryStatus::sizeHint() const {
+ QString text = statusText();
+ QString text2 = statusTextIpaq();
+ QFontMetrics fm = fontMetrics();
+ QRect r=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text );
+ QRect r2=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text2 );
+
+ if ( bat2 ) {
+ return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ),
+ r.width() ), 2 * 10 + 80 + r.height() + r2.height() );
+ }
+ return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ),
+ r.width() ), 2 * 10 + 40 + r.height() );
+}