author | mickeyl <mickeyl> | 2003-11-06 09:56:49 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-06 09:56:49 (UTC) |
commit | 56ad1eb7fb39ddc78026a0df096703fcf42f5a94 (patch) (unidiff) | |
tree | 25d1ba2c7c3bdef72592b8d2de3e2a54f3294c2e | |
parent | 2f974fea9a432e9dd7b7a8ad235a4e6bc2ef51fe (diff) | |
download | opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.zip opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.tar.gz opie-56ad1eb7fb39ddc78026a0df096703fcf42f5a94.tar.bz2 |
merge core/applets/*
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 8 | ||||
-rw-r--r-- | core/applets/vmemo/vmemo.cpp | 3 |
2 files changed, 4 insertions, 7 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 | |||
@@ -100,16 +100,16 @@ bool BatteryStatus::getProcApmStatusIpaq() { | |||
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 | ||
@@ -226,16 +226,16 @@ void BatteryStatus::paintEvent( QPaintEvent * ) { | |||
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 | } |
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp index 83c148f..fe8ebfd 100644 --- a/core/applets/vmemo/vmemo.cpp +++ b/core/applets/vmemo/vmemo.cpp | |||
@@ -9,11 +9,8 @@ | |||
9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 9 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
10 | ** | 10 | ** |
11 | ************************************************************************************/ | 11 | ************************************************************************************/ |
12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> | 12 | // copyright 2002 Jeremy Cowgar <jc@cowgar.com> |
13 | /* | ||
14 | * $Id$ | ||
15 | */ | ||
16 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> | 13 | // copyright 2002 and 2003 L.J.Potter <ljp@llornkcor.com> |
17 | 14 | ||
18 | extern "C" { | 15 | extern "C" { |
19 | #include "adpcm.h" | 16 | #include "adpcm.h" |