| -rw-r--r-- | core/applets/batteryapplet/batteryapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 164 | ||||
| -rw-r--r-- | core/applets/batteryapplet/batterystatus.h | 14 |
3 files changed, 144 insertions, 36 deletions
diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro index a947ca6..d7e0a92 100644 --- a/core/applets/batteryapplet/batteryapplet.pro +++ b/core/applets/batteryapplet/batteryapplet.pro @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include .. -LIBS += -lqpe +LIBS += -lqpe -lopie VERSION = 1.0.0 diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index d18b6c9..2af3e99 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -1,20 +1,2 @@ -/********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. -** -** This file is part of Qtopia Environment. -** -** This file may be distributed and/or modified under the terms of the -** GNU General Public License version 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -**********************************************************************/ + #include "batterystatus.h" @@ -23,2 +5,4 @@ +#include <opie/odevice.h> + #include <qpainter.h> @@ -26,11 +10,18 @@ #include <qdrawutil.h> +#include <qfile.h> +#include <qtextstream.h> +#include <qmessagebox.h> +using namespace Opie; BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) - : QWidget( parent, 0, WDestructiveClose), ps(p) -{ - setCaption( tr("Battery Status") ); + : QWidget( parent, 0, WDestructiveClose), ps(p) { + setCaption( tr("Battery status for Ipaq") ); QPushButton *pb = new QPushButton( tr("Close"), this ); - pb->move( 70, 220 ); + pb->move( 70, 250 ); + pb->setMaximumHeight(20); pb->show(); + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { + getProcApmStatusIpaq(); + } connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); @@ -44,4 +35,78 @@ BatteryStatus::~BatteryStatus() -void BatteryStatus::updatePercent( int pc ) -{ +/* + * Make use of the advanced apm interface of the ipaq + */ +bool BatteryStatus::getProcApmStatusIpaq() { + + bat2 = false; + + QFile procApmIpaq("/proc/hal/battery"); + + if (procApmIpaq.open(IO_ReadOnly) ) { + QStringList list; + // since it is /proc we _must_ use QTextStream + QTextStream stream ( &procApmIpaq); + QString streamIn; + streamIn = stream.read(); + list = QStringList::split("\n", streamIn); + + for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { + // not nice, need a rewrite later + if( (*line).startsWith(" Percentage") ){ + if (bat2 == true) { + perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); + } else { + perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); + } + }else if( (*line).startsWith(" Life") ){ + if (bat2 == true) { + sec2 = (*line).mid(((*line).find(':')+2), 5 ); + } else { + sec1 = (*line).mid(((*line).find(':')+2), 5 ); + } + }else if( (*line).startsWith("Battery #1") ){ + bat2 = true; + }else if( (*line).startsWith(" Status") ){ + if (bat2 == true) { + jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1); + } else { + ipaqStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1); + } + }else if( (*line).startsWith(" Chemistry") ) { + if (bat2 == true) { + jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); + } else { + ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); + } + } + } + } else { + QMessageBox::warning(this, tr("Failure"),tr("could not open file")); + } + + procApmIpaq.close(); + + jackPercent = perc2.toInt(); + ipaqPercent = perc1.toInt(); + + if (perc2.isEmpty()) { + perc2 = "no data"; + } else { + perc2 += " %"; + } + + + if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { + sec2 = "no data"; + } else { + sec2 += " min"; + } + + jackStatus == (" ( " + jackStatus + " )"); + + return true; +} + + +void BatteryStatus::updatePercent( int pc ) { percent = pc; @@ -50,4 +115,3 @@ void BatteryStatus::updatePercent( int pc ) -void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) -{ +void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) { int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height; @@ -71,4 +135,4 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg -void BatteryStatus::paintEvent( QPaintEvent * ) -{ +void BatteryStatus::paintEvent( QPaintEvent * ) { + QPainter p(this); @@ -76,3 +140,7 @@ void BatteryStatus::paintEvent( QPaintEvent * ) if ( ps->batteryStatus() == PowerStatus::Charging ) { + if (bat2) { + text = tr("Charging both devices"); + } else { text = tr("Charging"); + } } else if ( ps->batteryPercentAccurate() ) { @@ -98,9 +166,10 @@ void BatteryStatus::paintEvent( QPaintEvent * ) } - p.drawText( 10, 120, text ); + p.drawText( 10, 90, text ); + if ( ps->acStatus() == PowerStatus::Backup ) - p.drawText( 10, 150, tr("On backup power") ); + p.drawText( 10, 110, tr("On backup power") ); else if ( ps->acStatus() == PowerStatus::Online ) - p.drawText( 10, 150, tr("Power on-line") ); + p.drawText( 10, 110, tr("Power on-line") ); else if ( ps->acStatus() == PowerStatus::Offline ) - p.drawText( 10, 150, tr("External power disconnected") ); + p.drawText( 10, 110, tr("External power disconnected") ); @@ -109,3 +178,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); - p.drawText( 10, 180, text ); + p.drawText( 10, 130, text ); } @@ -138,2 +207,29 @@ void BatteryStatus::paintEvent( QPaintEvent * ) drawSegment( &p, QRect( 212, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); + p.setPen( black); + + + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { + + p.drawText(15, 50, 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); + jacketMsg = tr("Jacket " + jackChem); + } else { + jackPercent = 0; + jacketMsg = tr("No jacket with battery inserted"); + } + + qDrawShadePanel( &p, 9, 160, 204, 39, colorGroup(), TRUE, 1, NULL); + qDrawShadePanel( &p, 212, 167, 12, 24, colorGroup(), TRUE, 1, NULL); + drawSegment( &p, QRect( 10, 160, jackPercent*2, 40 ), lightc, darkc, lightc.light(115), 6 ); + drawSegment( &p, QRect( 11 + jackPercent*2, 160, 200 - jackPercent*2, 40 ), white.light(80), black, white.light(90), 6 ); + drawSegment( &p, QRect( 212, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); + p.setPen( black ); + p.drawText(15, 180, jacketMsg); + } + } diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h index 0dc25af..18c2943 100644 --- a/core/applets/batteryapplet/batterystatus.h +++ b/core/applets/batteryapplet/batterystatus.h @@ -38,3 +38,3 @@ protected: void paintEvent( QPaintEvent *pe ); - + bool BatteryStatus::getProcApmStatusIpaq(); private: @@ -42,2 +42,14 @@ private: int percent; + int ipaqPercent; + int jackPercent; + int jackMinutes; + QString perc1; + QString sec1; + QString perc2; + QString sec2; + QString ipaqStatus; + QString jackStatus; + QString ipaqChem; + QString jackChem; + bool bat2; }; |