Diffstat (limited to 'core/applets/batteryapplet/batterystatus.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 5936b5d..64e0499 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp | |||
@@ -98,20 +98,20 @@ bool BatteryStatus::getProcApmStatusIpaq() { | |||
98 | procApmIpaq.close(); | 98 | procApmIpaq.close(); |
99 | 99 | ||
100 | jackPercent = perc2.toInt(); | 100 | jackPercent = perc2.toInt(); |
101 | ipaqPercent = perc1.toInt(); | 101 | ipaqPercent = perc1.toInt(); |
102 | 102 | ||
103 | if (perc2.isEmpty()) { | 103 | if (perc2.isEmpty()) { |
104 | perc2 = "no data"; | 104 | perc2 = tr("no data"); |
105 | } else { | 105 | } else { |
106 | perc2 += " %"; | 106 | perc2 += " %"; |
107 | } | 107 | } |
108 | 108 | ||
109 | 109 | ||
110 | if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { | 110 | if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) { |
111 | sec2 = "no data"; | 111 | sec2 = tr("no data"); |
112 | } else { | 112 | } else { |
113 | sec2 += " min"; | 113 | sec2 += " min"; |
114 | } | 114 | } |
115 | 115 | ||
116 | jackStatus == (" ( " + jackStatus + " )"); | 116 | jackStatus == (" ( " + jackStatus + " )"); |
117 | 117 | ||
@@ -224,20 +224,20 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
224 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); | 224 | drawSegment( &p, QRect( rightEnd2, 37, 10, 25 ), white.light(80), black, white.light(90), 2 ); |
225 | p.setPen( black); | 225 | p.setPen( black); |
226 | 226 | ||
227 | 227 | ||
228 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { | 228 | if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) { |
229 | 229 | ||
230 | p.drawText(15, 50, tr ("Ipaq " + ipaqChem)); | 230 | p.drawText(15, 50, tr ("Ipaq ") + ipaqChem); |
231 | 231 | ||
232 | QString jacketMsg; | 232 | QString jacketMsg; |
233 | if (bat2) { | 233 | if (bat2) { |
234 | p.setPen(black); | 234 | p.setPen(black); |
235 | p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus); | 235 | p.drawText(10,220, tr("Percentage battery remaining: ") + perc2 + " " + jackStatus); |
236 | p.drawText(10,240, tr("Battery time remaining: ") + sec2); | 236 | p.drawText(10,240, tr("Battery time remaining: ") + sec2); |
237 | jacketMsg = tr("Jacket " + jackChem); | 237 | jacketMsg = tr("Jacket ") + jackChem; |
238 | } else { | 238 | } else { |
239 | jackPercent = 0; | 239 | jackPercent = 0; |
240 | jacketMsg = tr("No jacket with battery inserted"); | 240 | jacketMsg = tr("No jacket with battery inserted"); |
241 | } | 241 | } |
242 | 242 | ||
243 | int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ; | 243 | int jackPerc = ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ; |