summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index f27543c..addb517 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -226,37 +226,37 @@ void BatteryStatus::paintEvent( QPaintEvent * ev ) {
226 if (bat2) { 226 if (bat2) {
227 p.setPen(black); 227 p.setPen(black);
228 QString text = statusTextIpaq(); 228 QString text = statusTextIpaq();
229 p.drawText( 10, 150, text ); 229 p.drawText( 10, 150, text );
230 jacketMsg = tr("Jacket ") + jackChem; 230 jacketMsg = tr("Jacket ") + jackChem;
231 } else { 231 } else {
232 jackPercent = 0; 232 jackPercent = 0;
233 jacketMsg = tr("No jacket with battery inserted"); 233 jacketMsg = tr("No jacket with battery inserted");
234 } 234 }
235 235
236 int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100; 236 int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100;
237 237
238 qDrawShadePanel( &p, 9, 90, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); 238 qDrawShadePanel( &p, 9, 90, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
239 qDrawShadePanel( &p, rightEnd2, 97, 12, 24, colorGroup(), TRUE, 1, NULL); 239 qDrawShadePanel( &p, rightEnd2, 97, 12, 24, colorGroup(), TRUE, 1, NULL);
240 drawSegment( &p, QRect( 10, 90, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); 240 drawSegment( &p, QRect( 10, 90, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
241 drawSegment( &p, QRect( 11 + jackPerc, 90, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 ); 241 drawSegment( &p, QRect( 11 + jackPerc, 90, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
242 drawSegment( &p, QRect( rightEnd2, 97, 10, 25 ), white.light(80), black, white.light(90), 2 ); 242 drawSegment( &p, QRect( rightEnd2, 97, 10, 25 ), white.light(80), black, white.light(90), 2 );
243 p.setPen( black ); 243 p.setPen( black );
244 p.drawText(15, 100, width() - 20, 20 , AlignVCenter, jacketMsg); 244 p.drawText(15, 100, width() - 20, 20 , AlignVCenter, jacketMsg);
245 } 245 }
246 QFrame::paintEvent(ev); 246 QFrame::paintEvent(ev);
247} 247}
248 248
249QSize BatteryStatus::sizeHint() const { 249QSize BatteryStatus::sizeHint() const {
250 QString text = statusText(); 250 QString text = statusText();
251 QString text2 = statusTextIpaq(); 251 QString text2 = statusTextIpaq();
252 QFontMetrics fm = fontMetrics(); 252 QFontMetrics fm = fontMetrics();
253 QRect r=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text ); 253 QRect r=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text );
254 QRect r2=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text2 ); 254 QRect r2=fm.boundingRect( 10, 0, width(), height(), AlignVCenter, text2 );
255 255
256 if ( bat2 ) { 256 if ( bat2 ) {
257 return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ), 257 return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ),
258 r.width() ), 2 * 10 + 80 + r.height() + r2.height() ); 258 r.width()+2*10 ), 2 * 10 + 80 + r.height() + r2.height() );
259 } 259 }
260 return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ), 260 return QSize( QMAX( QMIN( 200, qApp->desktop()->width() ),
261 r.width() ), 2 * 10 + 40 + r.height() ); 261 r.width()+2*10 ), 2 * 10 + 40 + r.height() );
262} 262}