author | harlekin <harlekin> | 2004-05-11 22:41:22 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-05-11 22:41:22 (UTC) |
commit | 7a9cabb330284777113bb544139843dcf0593628 (patch) (side-by-side diff) | |
tree | ec706423d2abc2b7d2dcbbab8f3d846bcff45ee0 /core/applets | |
parent | 81104f00cb87962333a024d3fa5ff6cf3d8d7d83 (diff) | |
download | opie-7a9cabb330284777113bb544139843dcf0593628.zip opie-7a9cabb330284777113bb544139843dcf0593628.tar.gz opie-7a9cabb330284777113bb544139843dcf0593628.tar.bz2 |
the "bett ery" commit, batteryapplet is now a popup, only shows second battery on ipaq if a second battery is present
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 104 | ||||
-rw-r--r-- | core/applets/batteryapplet/battery.h | 3 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 407 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.h | 12 |
4 files changed, 270 insertions, 256 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 98b61b5..0d3d190 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -37,4 +37,3 @@ using namespace Opie::Ui; BatteryMeter::BatteryMeter( QWidget *parent ) - : QWidget( parent ), charging(false) -{ +: QWidget( parent ), charging(false) { ps = new PowerStatus; @@ -42,3 +41,3 @@ BatteryMeter::BatteryMeter( QWidget *parent ) - setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); + setFixedWidth( QMAX(AppLnk::smallIconSize()*3/4, 6) ); setFixedHeight( AppLnk::smallIconSize() ); @@ -54,4 +53,3 @@ BatteryMeter::BatteryMeter( QWidget *parent ) -BatteryMeter::~BatteryMeter() -{ +BatteryMeter::~BatteryMeter() { delete ps; @@ -59,4 +57,3 @@ BatteryMeter::~BatteryMeter() -QSize BatteryMeter::sizeHint() const -{ +QSize BatteryMeter::sizeHint() const { return QSize(QMAX(AppLnk::smallIconSize()*3/4, 6), height() ); @@ -64,6 +61,4 @@ QSize BatteryMeter::sizeHint() const -void BatteryMeter::mousePressEvent( QMouseEvent* e ) -{ - if ( e->button() == RightButton ) - { +void BatteryMeter::mousePressEvent( QMouseEvent* e ) { + if ( e->button() == RightButton ) { style = 1-style; @@ -77,11 +72,20 @@ void BatteryMeter::mousePressEvent( QMouseEvent* e ) -void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ ) -{ +void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ ) { if ( batteryView && batteryView->isVisible() ) { - delete (QWidget *) batteryView; + batteryView->hide(); } else { - if ( !batteryView ) batteryView = new BatteryStatus( ps ); - QPEApplication::showWidget( batteryView ); + if ( !batteryView ) { + batteryView = new BatteryStatus( ps, 0, WStyle_StaysOnTop | WType_Popup ); + batteryView->setFrameStyle( QFrame::PopupPanel | QFrame::Raised ); + } + + QRect r(batteryView->pos(),batteryView->sizeHint()); + QPoint curPos = this->mapToGlobal ( rect().topLeft() ); + + int lp = qApp->desktop()->width() - batteryView->sizeHint().width(); + r.moveTopLeft( QPoint(lp, curPos.y()-batteryView->sizeHint().height()-1) ); + batteryView->setGeometry(r); + batteryView->raise(); - batteryView->showMaximized(); + batteryView->show(); } @@ -89,4 +93,4 @@ void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ ) -void BatteryMeter::timerEvent( QTimerEvent * ) -{ + +void BatteryMeter::timerEvent( QTimerEvent * ) { PowerStatus prev = *ps; @@ -96,16 +100,16 @@ void BatteryMeter::timerEvent( QTimerEvent * ) if ( prev != *ps ) { - percent = ps->batteryPercentRemaining(); - if ( !charging && ps->batteryStatus() == PowerStatus::Charging ) { - percent = 0; - charging = true; - chargeTimer->start( 500 ); - } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) { - charging = false; - chargeTimer->stop(); + percent = ps->batteryPercentRemaining(); + if ( !charging && ps->batteryStatus() == PowerStatus::Charging ) { + percent = 0; + charging = true; + chargeTimer->start( 500 ); + } else if ( charging && ps->batteryStatus() != PowerStatus::Charging ) { + charging = false; + chargeTimer->stop(); + if ( batteryView ) + batteryView->updatePercent( percent ); + } + repaint( style != 0 ); if ( batteryView ) - batteryView->updatePercent( percent ); - } - repaint( style != 0 ); - if ( batteryView ) - batteryView->repaint(); + batteryView->repaint(); } @@ -113,7 +117,6 @@ void BatteryMeter::timerEvent( QTimerEvent * ) -void BatteryMeter::chargeTimeout() -{ +void BatteryMeter::chargeTimeout() { percent += 20; if ( percent > 100 ) - percent = 0; + percent = 0; @@ -121,10 +124,8 @@ void BatteryMeter::chargeTimeout() if ( batteryView ) - batteryView->updatePercent( percent ); + batteryView->updatePercent( percent ); } -void BatteryMeter::paintEvent( QPaintEvent* ) -{ +void BatteryMeter::paintEvent( QPaintEvent* ) { - if ( style == 1 ) - { + if ( style == 1 ) { QPainter p(this); @@ -141,7 +142,11 @@ void BatteryMeter::paintEvent( QPaintEvent* ) QColor g = gray.light( 160 ); - switch ( ps->acStatus() ) - { - case PowerStatus::Offline: color = blue.light( 150 ); break; - case PowerStatus::Online: color = green.dark( 130 ).light( 180 ); break; - default: color = red.light( 160 ); + switch ( ps->acStatus() ) { + case PowerStatus::Offline: + color = blue.light( 150 ); + break; + case PowerStatus::Online: + color = green.dark( 130 ).light( 180 ); + break; + default: + color = red.light( 160 ); } @@ -149,3 +154,4 @@ void BatteryMeter::paintEvent( QPaintEvent* ) int w = height() / 2; - if ( !(w%2) ) w--; // should have an odd value to get a real middle line + if ( !(w%2) ) + w--; // should have an odd value to get a real middle line int h = height() - 4; @@ -164,4 +170,3 @@ void BatteryMeter::paintEvent( QPaintEvent* ) int middle = w/2; - for ( int i = 0; i < middle; i++ ) - { + for ( int i = 0; i < middle; i++ ) { p.setPen( gray.dark( 100+i*20 ) ); @@ -175,4 +180,3 @@ void BatteryMeter::paintEvent( QPaintEvent* ) -int BatteryMeter::position() -{ +int BatteryMeter::position() { return 8; diff --git a/core/applets/batteryapplet/battery.h b/core/applets/batteryapplet/battery.h index 622c083..970c857 100644 --- a/core/applets/batteryapplet/battery.h +++ b/core/applets/batteryapplet/battery.h @@ -39,2 +39,4 @@ class BatteryMeter : public QWidget + + protected: @@ -44,3 +46,2 @@ class BatteryMeter : public QWidget void mouseReleaseEvent( QMouseEvent* ); - protected slots: 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 @@ -11,3 +11,2 @@ #include <qfile.h> -#include <qlayout.h> #include <qtextstream.h> @@ -17,30 +16,14 @@ 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 ); +BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent, WFlags f ) +: QFrame( parent, 0, f), ps(p), bat2(false) { - QPushButton *pb = new QPushButton( tr("Close"), this ); - QVBoxLayout *layout = new QVBoxLayout ( this ); + jackPercent = 0; - 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(); + if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { + getProcApmStatusIpaq(); + } + percent = ps->batteryPercentRemaining(); } -BatteryStatus::~BatteryStatus() -{ -} +BatteryStatus::~BatteryStatus() {} @@ -51,69 +34,66 @@ 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); + 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 { - perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2); + QMessageBox::warning(this, tr("Failure"),tr("could not open file")); } - }else if( (*line).startsWith(" Life") ){ - if (bat2 == true) { - sec2 = (*line).mid(((*line).find(':')+2), 5 ); + + procApmIpaq.close(); + jackPercent = perc2.toInt(); + ipaqPercent = perc1.toInt(); + + if (perc2.isEmpty()) { + perc2 = tr("no data"); } else { - sec1 = (*line).mid(((*line).find(':')+2), 5 ); + perc2 += " %"; } - }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); + + if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { + sec2 = tr("no data"); } else { - ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1); + sec2 += " min"; } - } - } - } else { - QMessageBox::warning(this, tr("Failure"),tr("could not open file")); - } - - procApmIpaq.close(); - - jackPercent = perc2.toInt(); - ipaqPercent = perc1.toInt(); - - if (perc2.isEmpty()) { - perc2 = tr("no data"); - } else { - perc2 += " %"; - } - - - if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { - sec2 = tr("no data"); - } else { - sec2 += " min"; - } - - jackStatus == (" ( " + jackStatus + " )"); - return true; + jackStatus == (" ( " + jackStatus + " )"); + return true; } @@ -122,4 +102,4 @@ bool BatteryStatus::getProcApmStatusIpaq() { void BatteryStatus::updatePercent( int pc ) { - percent = pc; - repaint(FALSE); + percent = pc; + repaint(FALSE); } @@ -127,125 +107,150 @@ 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 ) { - 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 ); + 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 ); } - 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 * ) { +QString BatteryStatus::statusText() const { + QString text; - QPainter p(this); - QString text; - if ( ps->batteryStatus() == PowerStatus::Charging ) { + if ( ps->batteryStatus() == PowerStatus::Charging ) { if (bat2) { - text = tr("Charging both devices"); - } else { - text = tr("Charging"); - } - } else if ( ps->batteryPercentAccurate() ) { + 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"); + } 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, 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 ); - 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 = width() - 47; - int rightEnd2 = width() - 35; - 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 ); - 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 * ( 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 ); - p.setPen( black ); - p.drawText(15, 180, jacketMsg); - } + if ( ps->acStatus() == PowerStatus::Backup ) + text += "\n" + tr("On backup power"); + else if ( ps->acStatus() == PowerStatus::Online ) + text += "\n" + tr("Power on-line"); + else if ( ps->acStatus() == PowerStatus::Offline ) + text += "\n" + tr("External power disconnected"); + + if ( ps->batteryTimeRemaining() >= 0 ) { + text += "\n" + QString().sprintf( tr("Battery time remaining") + ": %im %02is", + ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); + } + 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; + 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 = width() - 47; + int rightEnd2 = width() - 35; + int percent2 = (percent * rightEnd1) / 100; + p.setPen( black ); + 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 ) { + + p.drawText( 15, 30, tr ("Ipaq ") + ipaqChem ); + + QString jacketMsg; + if (bat2) { + p.setPen(black); + QString text = statusTextIpaq(); + p.drawText( 10, 150, text ); + jacketMsg = tr("Jacket ") + jackChem; + } else { + jackPercent = 0; + jacketMsg = tr("No jacket with battery inserted"); + } + + int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100; + + 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, 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() ); +} diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h index a5ab804..bb95ece 100644 --- a/core/applets/batteryapplet/batterystatus.h +++ b/core/applets/batteryapplet/batterystatus.h @@ -22,3 +22,3 @@ -#include <qwidget.h> +#include <qframe.h> @@ -26,3 +26,3 @@ class PowerStatus; -class BatteryStatus : public QWidget +class BatteryStatus : public QFrame { @@ -30,3 +30,3 @@ class BatteryStatus : public QWidget public: - BatteryStatus( const PowerStatus *s, QWidget *parent=0 ); + BatteryStatus( const PowerStatus *s, QWidget *parent=0, WFlags f = 0 ); ~BatteryStatus(); @@ -34,3 +34,3 @@ public: void updatePercent( int ); - + QSize sizeHint() const; protected: @@ -39,3 +39,6 @@ protected: bool BatteryStatus::getProcApmStatusIpaq(); + private: + QString statusText() const; + QString statusTextIpaq() const; const PowerStatus *ps; @@ -54,2 +57,3 @@ private: bool bat2; + bool bat2inserted; int screenWidth; |