author | drw <drw> | 2004-02-18 16:23:17 (UTC) |
---|---|---|
committer | drw <drw> | 2004-02-18 16:23:17 (UTC) |
commit | 7d16774139aa40fb812d636bcf9ad3f45aa2b9e1 (patch) (side-by-side diff) | |
tree | 51dc00c15db884b4f4351ed685e022853446a0d6 /core/applets | |
parent | 45179e1807aa5ca024b423112303509f91253a53 (diff) | |
download | opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.zip opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.tar.gz opie-7d16774139aa40fb812d636bcf9ad3f45aa2b9e1.tar.bz2 |
Fix size and drawing of battery status widget and eliminate compiler warnings
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 8 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 75 |
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 @@ -72,3 +72,3 @@ void BatteryMeter::mousePressEvent( QMouseEvent* e ) -void BatteryMeter::mouseReleaseEvent( QMouseEvent* e) +void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ ) { @@ -112,3 +112,3 @@ void BatteryMeter::chargeTimeout() if ( percent > 100 ) - percent = 0; + percent = 0; @@ -116,3 +116,3 @@ void BatteryMeter::chargeTimeout() if ( batteryView ) - batteryView->updatePercent( percent ); + batteryView->updatePercent( percent ); } @@ -156,3 +156,3 @@ void BatteryMeter::paintEvent( QPaintEvent* ) - int extra = ((percent * h) % 100)/(100/4); + //int extra = ((percent * h) % 100)/(100/4); 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 @@ -21,2 +21,4 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) setCaption( tr("Battery status") ); + setMinimumSize( 150, 200 ); + QPushButton *pb = new QPushButton( tr("Close"), this ); @@ -26,4 +28,3 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) - pb->setMaximumHeight(40); - pb->setMaximumWidth( 120 ); + pb->setMaximumSize( 120, 40 ); @@ -31,3 +32,3 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) - layout->addStretch( 0 ); + layout->addStretch(); layout->addWidget( pb ); @@ -66,27 +67,27 @@ bool BatteryStatus::getProcApmStatusIpaq() { 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); + } } @@ -132,3 +133,3 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg 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 ); @@ -141,3 +142,3 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg 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 ); @@ -148,6 +149,2 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { - - int screenWidth = qApp->desktop()->width(); - int screenHeight = qApp->desktop()->height(); - QPainter p(this); @@ -155,7 +152,7 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { 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() ) { @@ -192,3 +189,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { 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 ); @@ -215,5 +212,5 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { - 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 ); @@ -242,3 +239,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { - int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ; + int jackPerc = ( jackPercent / 100 ) * ( width() - 47 ) ; |