author | harlekin <harlekin> | 2004-06-20 12:32:59 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-06-20 12:32:59 (UTC) |
commit | 3d49080501c6619f9bb323be9935d28f4458530f (patch) (side-by-side diff) | |
tree | 277baf812e3377554ea1369f54b6b5ac7814d118 | |
parent | 63dd6d0c5919bd905f9c39eb1641d18c5372cdda (diff) | |
download | opie-3d49080501c6619f9bb323be9935d28f4458530f.zip opie-3d49080501c6619f9bb323be9935d28f4458530f.tar.gz opie-3d49080501c6619f9bb323be9935d28f4458530f.tar.bz2 |
BUGFIX: 0001321 - The batteryapplet shows a real popup frame now
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 655fdc4..5a24b94 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -167,25 +167,25 @@ QString BatteryStatus::statusText() const { 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 * ) { +void BatteryStatus::paintEvent( QPaintEvent * ev ) { 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); @@ -229,24 +229,25 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { } 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); } + QFrame::paintEvent(ev); } 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() ); |