summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/battery.cpp8
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp75
2 files changed, 40 insertions, 43 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 3b64fb5..9a9ddf6 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -61,25 +61,25 @@ void BatteryMeter::mousePressEvent( QMouseEvent* e )
{
if ( e->button() == RightButton )
{
style = 1-style;
Config c( "qpe" );
c.setGroup( "Battery" );
c.writeEntry( "Style", style );
repaint( true );
}
QWidget::mousePressEvent( e );
}
-void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
+void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ )
{
if ( batteryView && batteryView->isVisible() ) {
delete (QWidget *) batteryView;
} else {
if ( !batteryView ) batteryView = new BatteryStatus( ps );
QPEApplication::showWidget( batteryView );
batteryView->raise();
batteryView->show();
}
}
void BatteryMeter::timerEvent( QTimerEvent * )
@@ -101,29 +101,29 @@ void BatteryMeter::timerEvent( QTimerEvent * )
batteryView->updatePercent( percent );
}
repaint( style != 0 );
if ( batteryView )
batteryView->repaint();
}
}
void BatteryMeter::chargeTimeout()
{
percent += 20;
if ( percent > 100 )
- percent = 0;
+ percent = 0;
repaint(FALSE);
if ( batteryView )
- batteryView->updatePercent( percent );
+ batteryView->updatePercent( percent );
}
void BatteryMeter::paintEvent( QPaintEvent* )
{
if ( style == 1 )
{
QPainter p(this);
QFont f( "Fixed", AppLnk::smallIconSize()/2 );
QFontMetrics fm( f );
p.setFont( f );
p.drawText( 0, height()/2, QString::number( percent ) );
@@ -145,25 +145,25 @@ void BatteryMeter::paintEvent( QPaintEvent* )
if ( !(w%2) ) w--; // should have an odd value to get a real middle line
int h = height() - 4;
int pix = (percent * h) / 100;
int y2 = height() -2;
int y = y2 - pix;
int x1 = (width() - w ) / 2;
p.setPen(QColor(80,80,80));
p.drawLine(x1+w/4,0,x1+w/4+w/2+1,0); // header
p.drawRect(x1,1,w,height()-1); // corpus
p.setBrush(color);
- int extra = ((percent * h) % 100)/(100/4);
+ //int extra = ((percent * h) % 100)/(100/4);
int middle = w/2;
for ( int i = 0; i < middle; i++ )
{
p.setPen( gray.dark( 100+i*20 ) );
p.drawLine( x1+middle-i, 2, x1+middle-i, y-1 );
p.drawLine( x1+middle+i, 2, x1+middle+i, y-1 );
p.setPen( color.dark( 100+i*20 ) );
p.drawLine( x1+middle-i, y, x1+middle-i, y2 );
p.drawLine( x1+middle+i, y, x1+middle+i, y2 );
}
}
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 64e0499..86b20e8 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -10,35 +10,36 @@
#include <qdrawutil.h>
#include <qfile.h>
#include <qlayout.h>
#include <qtextstream.h>
#include <qapplication.h>
#include <qmessagebox.h>
using namespace Opie;
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 );
jackPercent = 0;
- pb->setMaximumHeight(40);
- pb->setMaximumWidth( 120 );
+ pb->setMaximumSize( 120, 40 );
pb->show();
- layout->addStretch( 0 );
+ 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()
{
@@ -55,49 +56,49 @@ bool BatteryStatus::getProcApmStatusIpaq() {
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);
- }
+ 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 );
- }
+ 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;
+ bat2 = true;
}else if( (*line).startsWith(" Status") ){
- if (bat2 == true) {
- jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
+ 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);
- }
+ 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);
- }
+ 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()) {
@@ -121,52 +122,48 @@ bool BatteryStatus::getProcApmStatusIpaq() {
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 ) {
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 ) );
+ 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 ) );
+ 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 * ) {
-
- int screenWidth = qApp->desktop()->width();
- int screenHeight = qApp->desktop()->height();
-
QPainter p(this);
QString text;
if ( ps->batteryStatus() == PowerStatus::Charging ) {
- if (bat2) {
- text = tr("Charging both devices");
- } else {
- text = tr("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:
@@ -181,75 +178,75 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
}
p.drawText( 10, 90, text );
if ( ps->acStatus() == PowerStatus::Backup )
p.drawText( 10, 110, tr("On backup power") );
else if ( ps->acStatus() == PowerStatus::Online )
p.drawText( 10, 110, tr("Power on-line") );
else if ( ps->acStatus() == PowerStatus::Offline )
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 );
+ ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
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 rightEnd1 = screenWidth - 47;
- int rightEnd2 = screenWidth - 35;
- int percent2 = ( percent / 100.0 ) * rightEnd1 ;
+ int rightEnd1 = width() - 47;
+ int rightEnd2 = width() - 35;
+ int percent2 = ( percent / 100 ) * rightEnd1 ;
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 );
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");
}
- int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
+ int jackPerc = ( jackPercent / 100 ) * ( width() - 47 ) ;
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 );
p.setPen( black );
p.drawText(15, 180, jacketMsg);
}
}