summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/batteryapplet/batteryapplet.pro2
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp164
-rw-r--r--core/applets/batteryapplet/batterystatus.h14
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
@@ -1,27 +1,27 @@
TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = battery.h batterystatus.h batteryappletimpl.h
SOURCES = battery.cpp batterystatus.cpp batteryappletimpl.cpp
TARGET = batteryapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ../$(OPIEDIR)/include ..
-LIBS += -lqpe
+LIBS += -lqpe -lopie
VERSION = 1.0.0
TRANSLATIONS = ../../../i18n/de/libbatteryapplet.ts \
../../../i18n/da/libbatteryapplet.ts \
../../../i18n/xx/libbatteryapplet.ts \
../../../i18n/en/libbatteryapplet.ts \
../../../i18n/es/libbatteryapplet.ts \
../../../i18n/fr/libbatteryapplet.ts \
../../../i18n/hu/libbatteryapplet.ts \
../../../i18n/ja/libbatteryapplet.ts \
../../../i18n/ko/libbatteryapplet.ts \
../../../i18n/no/libbatteryapplet.ts \
../../../i18n/pl/libbatteryapplet.ts \
../../../i18n/pt/libbatteryapplet.ts \
../../../i18n/pt_BR/libbatteryapplet.ts \
../../../i18n/sl/libbatteryapplet.ts \
../../../i18n/zh_CN/libbatteryapplet.ts \
../../../i18n/zh_TW/libbatteryapplet.ts
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,140 +1,236 @@
-/**********************************************************************
-** 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"
#include <qpe/power.h>
+#include <opie/odevice.h>
+
#include <qpainter.h>
#include <qpushbutton.h>
#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() ) );
percent = ps->batteryPercentRemaining();
show();
}
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;
repaint(FALSE);
}
-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;
topgrad.hsv( &h1, &s1, &v1 );
botgrad.hsv( &h2, &s2, &v2 );
for ( int j = 0; j < hy-2; j++ ) {
p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) );
p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j );
}
for ( int j = 0; j < hh; j++ ) {
p->setPen( highlight );
p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j );
}
for ( int j = 0; j < ng-hy-hh; j++ ) {
p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
v1 + ((v2-v1)*j)/(ng-1), QColor::Hsv ) );
p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j );
}
}
-void BatteryStatus::paintEvent( QPaintEvent * )
-{
+void BatteryStatus::paintEvent( QPaintEvent * ) {
+
QPainter p(this);
QString text;
if ( ps->batteryStatus() == PowerStatus::Charging ) {
+ if (bat2) {
+ text = tr("Charging both devices");
+ } else {
text = tr("Charging");
+ }
} else if ( ps->batteryPercentAccurate() ) {
text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent );
} else {
text = tr("Battery status: ");
switch ( ps->batteryStatus() ) {
case PowerStatus::High:
text += tr("Good");
break;
case PowerStatus::Low:
text += tr("Low");
break;
case PowerStatus::VeryLow:
text += tr("Very Low");
break;
case PowerStatus::Critical:
text += tr("Critical");
break;
default: // NotPresent, etc.
text += tr("Unknown");
}
}
- 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") );
if ( ps->batteryTimeRemaining() >= 0 ) {
text.sprintf( tr("Battery time remaining") + ": %im %02is",
ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
- p.drawText( 10, 180, text );
+ p.drawText( 10, 130, text );
}
QColor c;
QColor darkc;
QColor lightc;
if ( ps->acStatus() == PowerStatus::Offline ) {
c = blue.light(120);
darkc = c.dark(280);
lightc = c.light(145);
} else if ( ps->acStatus() == PowerStatus::Online ) {
c = green.dark(130);
darkc = c.dark(200);
lightc = c.light(220);
} else {
c = red;
darkc = c.dark(280);
lightc = c.light(140);
}
if ( percent < 0 )
return;
int percent2 = percent * 2;
p.setPen( black );
qDrawShadePanel( &p, 9, 30, 204, 39, colorGroup(), TRUE, 1, NULL);
qDrawShadePanel( &p, 212, 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, 200 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
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
@@ -1,46 +1,58 @@
/**********************************************************************
** 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.
**
**********************************************************************/
#ifndef BATTERY_STATUS_H
#define BATTERY_STATUS_H
#include <qwidget.h>
class PowerStatus;
class BatteryStatus : public QWidget
{
Q_OBJECT
public:
BatteryStatus( const PowerStatus *s, QWidget *parent=0 );
~BatteryStatus();
void updatePercent( int );
protected:
void drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height );
void paintEvent( QPaintEvent *pe );
-
+ bool BatteryStatus::getProcApmStatusIpaq();
private:
const PowerStatus *ps;
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;
};
#endif