author | harlekin <harlekin> | 2004-06-20 12:32:59 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-06-20 12:32:59 (UTC) |
commit | 3d49080501c6619f9bb323be9935d28f4458530f (patch) (unidiff) | |
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 { | |||
167 | ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); | 167 | ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); |
168 | } | 168 | } |
169 | return text; | 169 | return text; |
170 | } | 170 | } |
171 | 171 | ||
172 | QString BatteryStatus::statusTextIpaq() const { | 172 | QString BatteryStatus::statusTextIpaq() const { |
173 | QString text; | 173 | QString text; |
174 | text += tr("Percentage battery remaining: ") + perc2 + " " + jackStatus; | 174 | text += tr("Percentage battery remaining: ") + perc2 + " " + jackStatus; |
175 | text += "\n" + tr("Battery time remaining: ") + sec2; | 175 | text += "\n" + tr("Battery time remaining: ") + sec2; |
176 | return text; | 176 | return text; |
177 | } | 177 | } |
178 | 178 | ||
179 | void BatteryStatus::paintEvent( QPaintEvent * ) { | 179 | void BatteryStatus::paintEvent( QPaintEvent * ev ) { |
180 | 180 | ||
181 | QPainter p( this ); | 181 | QPainter p( this ); |
182 | 182 | ||
183 | QString text = statusText(); | 183 | QString text = statusText(); |
184 | p.drawText( 10, 50, width() - 20, 40 , AlignVCenter, text ); | 184 | p.drawText( 10, 50, width() - 20, 40 , AlignVCenter, text ); |
185 | 185 | ||
186 | QColor c; | 186 | QColor c; |
187 | QColor darkc; | 187 | QColor darkc; |
188 | QColor lightc; | 188 | QColor lightc; |
189 | if ( ps->acStatus() == PowerStatus::Offline ) { | 189 | if ( ps->acStatus() == PowerStatus::Offline ) { |
190 | c = blue.light(120); | 190 | c = blue.light(120); |
191 | darkc = c.dark(280); | 191 | darkc = c.dark(280); |
@@ -229,24 +229,25 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
229 | } | 229 | } |
230 | 230 | ||
231 | int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100; | 231 | int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100; |
232 | 232 | ||
233 | qDrawShadePanel( &p, 9, 90, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); | 233 | qDrawShadePanel( &p, 9, 90, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); |
234 | qDrawShadePanel( &p, rightEnd2, 97, 12, 24, colorGroup(), TRUE, 1, NULL); | 234 | qDrawShadePanel( &p, rightEnd2, 97, 12, 24, colorGroup(), TRUE, 1, NULL); |
235 | drawSegment( &p, QRect( 10, 90, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); | 235 | drawSegment( &p, QRect( 10, 90, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); |
236 | drawSegment( &p, QRect( 11 + jackPerc, 90, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 ); | 236 | drawSegment( &p, QRect( 11 + jackPerc, 90, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 ); |
237 | drawSegment( &p, QRect( rightEnd2, 97, 10, 25 ), white.light(80), black, white.light(90), 2 ); | 237 | drawSegment( &p, QRect( rightEnd2, 97, 10, 25 ), white.light(80), black, white.light(90), 2 ); |
238 | p.setPen( black ); | 238 | p.setPen( black ); |
239 | p.drawText(15, 100, width() - 20, 20 , AlignVCenter, jacketMsg); | 239 | p.drawText(15, 100, width() - 20, 20 , AlignVCenter, jacketMsg); |
240 | } | 240 | } |
241 | QFrame::paintEvent(ev); | ||
241 | } | 242 | } |
242 | 243 | ||
243 | QSize BatteryStatus::sizeHint() const { | 244 | QSize BatteryStatus::sizeHint() const { |
244 | QString text = statusText(); | 245 | QString text = statusText(); |
245 | QString text2 = statusTextIpaq(); | 246 | QString text2 = statusTextIpaq(); |
246 | QFontMetrics fm = fontMetrics(); | 247 | QFontMetrics fm = fontMetrics(); |
247 | QRect r=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text ); | 248 | QRect r=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text ); |
248 | QRect r2=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text2 ); | 249 | QRect r2=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text2 ); |
249 | 250 | ||
250 | if ( bat2 ) { | 251 | if ( bat2 ) { |
251 | return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ), | 252 | return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ), |
252 | r.width() ), 2 * 10 + 80 + r.height() + r2.height() ); | 253 | r.width() ), 2 * 10 + 80 + r.height() + r2.height() ); |