summaryrefslogtreecommitdiff
Unidiff
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
@@ -6,7 +6,7 @@ TARGET = batteryapplet
6 DESTDIR = $(OPIEDIR)/plugins/applets 6 DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += ../$(OPIEDIR)/include .. 8DEPENDPATH += ../$(OPIEDIR)/include ..
9LIBS += -lqpe 9LIBS += -lqpe -lopie
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12TRANSLATIONS = ../../../i18n/de/libbatteryapplet.ts \ 12TRANSLATIONS = ../../../i18n/de/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,38 +1,29 @@
1/********************************************************************** 1
2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3**
4** This file is part of Qtopia Environment.
5**
6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file.
10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15**
16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you.
18**
19**********************************************************************/
20#include "batterystatus.h" 2#include "batterystatus.h"
21 3
22#include <qpe/power.h> 4#include <qpe/power.h>
23 5
6#include <opie/odevice.h>
7
24#include <qpainter.h> 8#include <qpainter.h>
25#include <qpushbutton.h> 9#include <qpushbutton.h>
26#include <qdrawutil.h> 10#include <qdrawutil.h>
11#include <qfile.h>
12#include <qtextstream.h>
13#include <qmessagebox.h>
27 14
15using namespace Opie;
28 16
29BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) 17BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
30 : QWidget( parent, 0, WDestructiveClose), ps(p) 18 : QWidget( parent, 0, WDestructiveClose), ps(p) {
31{ 19 setCaption( tr("Battery status for Ipaq") );
32 setCaption( tr("Battery Status") );
33 QPushButton *pb = new QPushButton( tr("Close"), this ); 20 QPushButton *pb = new QPushButton( tr("Close"), this );
34 pb->move( 70, 220 ); 21 pb->move( 70, 250 );
22 pb->setMaximumHeight(20);
35 pb->show(); 23 pb->show();
24 if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
25 getProcApmStatusIpaq();
26 }
36 connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) ); 27 connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) );
37 percent = ps->batteryPercentRemaining(); 28 percent = ps->batteryPercentRemaining();
38 show(); 29 show();
@@ -42,14 +33,87 @@ BatteryStatus::~BatteryStatus()
42{ 33{
43} 34}
44 35
45void BatteryStatus::updatePercent( int pc ) 36/*
46{ 37 * Make use of the advanced apm interface of the ipaq
38 */
39bool BatteryStatus::getProcApmStatusIpaq() {
40
41 bat2 = false;
42
43 QFile procApmIpaq("/proc/hal/battery");
44
45 if (procApmIpaq.open(IO_ReadOnly) ) {
46 QStringList list;
47 // since it is /proc we _must_ use QTextStream
48 QTextStream stream ( &procApmIpaq);
49 QString streamIn;
50 streamIn = stream.read();
51 list = QStringList::split("\n", streamIn);
52
53 for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
54 // not nice, need a rewrite later
55 if( (*line).startsWith(" Percentage") ){
56 if (bat2 == true) {
57 perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
58 } else {
59 perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
60 }
61 }else if( (*line).startsWith(" Life") ){
62 if (bat2 == true) {
63 sec2 = (*line).mid(((*line).find(':')+2), 5 );
64 } else {
65 sec1 = (*line).mid(((*line).find(':')+2), 5 );
66 }
67 }else if( (*line).startsWith("Battery #1") ){
68 bat2 = true;
69 }else if( (*line).startsWith(" Status") ){
70 if (bat2 == true) {
71 jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
72 } else {
73 ipaqStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
74 }
75 }else if( (*line).startsWith(" Chemistry") ) {
76 if (bat2 == true) {
77 jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
78 } else {
79 ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
80 }
81 }
82 }
83 } else {
84 QMessageBox::warning(this, tr("Failure"),tr("could not open file"));
85 }
86
87 procApmIpaq.close();
88
89 jackPercent = perc2.toInt();
90 ipaqPercent = perc1.toInt();
91
92 if (perc2.isEmpty()) {
93 perc2 = "no data";
94 } else {
95 perc2 += " %";
96 }
97
98
99 if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
100 sec2 = "no data";
101 } else {
102 sec2 += " min";
103 }
104
105 jackStatus == (" ( " + jackStatus + " )");
106
107 return true;
108}
109
110
111void BatteryStatus::updatePercent( int pc ) {
47 percent = pc; 112 percent = pc;
48 repaint(FALSE); 113 repaint(FALSE);
49} 114}
50 115
51void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) 116void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) {
52{
53 int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height; 117 int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height;
54 topgrad.hsv( &h1, &s1, &v1 ); 118 topgrad.hsv( &h1, &s1, &v1 );
55 botgrad.hsv( &h2, &s2, &v2 ); 119 botgrad.hsv( &h2, &s2, &v2 );
@@ -69,12 +133,16 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
69 } 133 }
70} 134}
71 135
72void BatteryStatus::paintEvent( QPaintEvent * ) 136void BatteryStatus::paintEvent( QPaintEvent * ) {
73{ 137
74 QPainter p(this); 138 QPainter p(this);
75 QString text; 139 QString text;
76 if ( ps->batteryStatus() == PowerStatus::Charging ) { 140 if ( ps->batteryStatus() == PowerStatus::Charging ) {
141 if (bat2) {
142 text = tr("Charging both devices");
143 } else {
77 text = tr("Charging"); 144 text = tr("Charging");
145 }
78 } else if ( ps->batteryPercentAccurate() ) { 146 } else if ( ps->batteryPercentAccurate() ) {
79 text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent ); 147 text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent );
80 } else { 148 } else {
@@ -96,18 +164,19 @@ void BatteryStatus::paintEvent( QPaintEvent * )
96 text += tr("Unknown"); 164 text += tr("Unknown");
97 } 165 }
98 } 166 }
99 p.drawText( 10, 120, text ); 167 p.drawText( 10, 90, text );
168
100 if ( ps->acStatus() == PowerStatus::Backup ) 169 if ( ps->acStatus() == PowerStatus::Backup )
101 p.drawText( 10, 150, tr("On backup power") ); 170 p.drawText( 10, 110, tr("On backup power") );
102 else if ( ps->acStatus() == PowerStatus::Online ) 171 else if ( ps->acStatus() == PowerStatus::Online )
103 p.drawText( 10, 150, tr("Power on-line") ); 172 p.drawText( 10, 110, tr("Power on-line") );
104 else if ( ps->acStatus() == PowerStatus::Offline ) 173 else if ( ps->acStatus() == PowerStatus::Offline )
105 p.drawText( 10, 150, tr("External power disconnected") ); 174 p.drawText( 10, 110, tr("External power disconnected") );
106 175
107 if ( ps->batteryTimeRemaining() >= 0 ) { 176 if ( ps->batteryTimeRemaining() >= 0 ) {
108 text.sprintf( tr("Battery time remaining") + ": %im %02is", 177 text.sprintf( tr("Battery time remaining") + ": %im %02is",
109 ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); 178 ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
110 p.drawText( 10, 180, text ); 179 p.drawText( 10, 130, text );
111 } 180 }
112 181
113 QColor c; 182 QColor c;
@@ -136,5 +205,32 @@ void BatteryStatus::paintEvent( QPaintEvent * )
136 drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); 205 drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
137 drawSegment( &p, QRect( 11 + percent2, 30, 200 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); 206 drawSegment( &p, QRect( 11 + percent2, 30, 200 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
138 drawSegment( &p, QRect( 212, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); 207 drawSegment( &p, QRect( 212, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
208 p.setPen( black);
209
210
211 if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
212
213 p.drawText(15, 50, tr ("Ipaq " + ipaqChem));
214
215 QString jacketMsg;
216 if (bat2) {
217 p.setPen(black);
218 p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
219 p.drawText(10,240, tr("Battery time remaining: ") + sec2);
220 jacketMsg = tr("Jacket " + jackChem);
221 } else {
222 jackPercent = 0;
223 jacketMsg = tr("No jacket with battery inserted");
224 }
225
226 qDrawShadePanel( &p, 9, 160, 204, 39, colorGroup(), TRUE, 1, NULL);
227 qDrawShadePanel( &p, 212, 167, 12, 24, colorGroup(), TRUE, 1, NULL);
228 drawSegment( &p, QRect( 10, 160, jackPercent*2, 40 ), lightc, darkc, lightc.light(115), 6 );
229 drawSegment( &p, QRect( 11 + jackPercent*2, 160, 200 - jackPercent*2, 40 ), white.light(80), black, white.light(90), 6 );
230 drawSegment( &p, QRect( 212, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
231 p.setPen( black );
232 p.drawText(15, 180, jacketMsg);
233 }
234
139} 235}
140 236
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
@@ -36,10 +36,22 @@ public:
36protected: 36protected:
37 void drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ); 37 void drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height );
38 void paintEvent( QPaintEvent *pe ); 38 void paintEvent( QPaintEvent *pe );
39 39 bool BatteryStatus::getProcApmStatusIpaq();
40private: 40private:
41 const PowerStatus *ps; 41 const PowerStatus *ps;
42 int percent; 42 int percent;
43 int ipaqPercent;
44 int jackPercent;
45 int jackMinutes;
46 QString perc1;
47 QString sec1;
48 QString perc2;
49 QString sec2;
50 QString ipaqStatus;
51 QString jackStatus;
52 QString ipaqChem;
53 QString jackChem;
54 bool bat2;
43}; 55};
44 56
45#endif 57#endif