summaryrefslogtreecommitdiff
authorbrad <brad>2004-04-11 14:28:42 (UTC)
committer brad <brad>2004-04-11 14:28:42 (UTC)
commit66f497a5c7990d7e54cc1ae26995231ade55b86c (patch) (unidiff)
treec2e2a97a1ff6b40b8f76775a7479e0f19e7fce88
parent9716f8c5672a8596306a9b432d9fabc4361baea5 (diff)
downloadopie-66f497a5c7990d7e54cc1ae26995231ade55b86c.zip
opie-66f497a5c7990d7e54cc1ae26995231ade55b86c.tar.gz
opie-66f497a5c7990d7e54cc1ae26995231ade55b86c.tar.bz2
Simple math reorganisation for jacket battery display (same as last one for main battery, I just missed it)
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 858a794..ab8f36d 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -207,45 +207,45 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
207 lightc = c.light(140); 207 lightc = c.light(140);
208 } 208 }
209 if ( percent < 0 ) 209 if ( percent < 0 )
210 return; 210 return;
211 211
212 int rightEnd1 = width() - 47; 212 int rightEnd1 = width() - 47;
213 int rightEnd2 = width() - 35; 213 int rightEnd2 = width() - 35;
214 int percent2 = (percent * rightEnd1) / 100; 214 int percent2 = (percent * rightEnd1) / 100;
215 p.setPen( black ); 215 p.setPen( black );
216 qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL); 216 qDrawShadePanel( &p, 9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
217 qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL); 217 qDrawShadePanel( &p, rightEnd2, 37, 12, 24, colorGroup(), TRUE, 1, NULL);
218 drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 ); 218 drawSegment( &p, QRect( 10, 30, percent2, 40 ), lightc, darkc, lightc.light(115), 6 );
219 drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 ); 219 drawSegment( &p, QRect( 11 + percent2, 30, rightEnd1 - percent2, 40 ), white.light(80), black, white.light(90), 6 );
220 drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); 220 drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 );
221 p.setPen( black); 221 p.setPen( black);
222 222
223 223
224 if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { 224 if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
225 225
226 p.drawText(15, 50, tr ("Ipaq ") + ipaqChem); 226 p.drawText(15, 50, tr ("Ipaq ") + ipaqChem);
227 227
228 QString jacketMsg; 228 QString jacketMsg;
229 if (bat2) { 229 if (bat2) {
230 p.setPen(black); 230 p.setPen(black);
231 p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus); 231 p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus);
232 p.drawText(10,240, tr("Battery time remaining: ") + sec2); 232 p.drawText(10,240, tr("Battery time remaining: ") + sec2);
233 jacketMsg = tr("Jacket ") + jackChem; 233 jacketMsg = tr("Jacket ") + jackChem;
234 } else { 234 } else {
235 jackPercent = 0; 235 jackPercent = 0;
236 jacketMsg = tr("No jacket with battery inserted"); 236 jacketMsg = tr("No jacket with battery inserted");
237 } 237 }
238 238
239 int jackPerc = ( jackPercent / 100 ) * ( width() - 47 ) ; 239 int jackPerc = ( jackPercent * ( width() - 47 ) ) / 100;
240 240
241 qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL); 241 qDrawShadePanel( &p, 9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);
242 qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL); 242 qDrawShadePanel( &p, rightEnd2, 167, 12, 24, colorGroup(), TRUE, 1, NULL);
243 drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 ); 243 drawSegment( &p, QRect( 10, 160, jackPerc, 40 ), lightc, darkc, lightc.light(115), 6 );
244 drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 ); 244 drawSegment( &p, QRect( 11 + jackPerc, 160, rightEnd1 - jackPerc, 40 ), white.light(80), black, white.light(90), 6 );
245 drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 ); 245 drawSegment( &p, QRect( rightEnd2, 167, 10, 25 ), white.light(80), black, white.light(90), 2 );
246 p.setPen( black ); 246 p.setPen( black );
247 p.drawText(15, 180, jacketMsg); 247 p.drawText(15, 180, jacketMsg);
248 } 248 }
249 249
250} 250}
251 251