-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 | |||
@@ -171,17 +171,17 @@ QString BatteryStatus::statusText() const { | |||
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; |
@@ -233,16 +233,17 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
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 ); |