author | brad <brad> | 2004-04-11 14:28:42 (UTC) |
---|---|---|
committer | brad <brad> | 2004-04-11 14:28:42 (UTC) |
commit | 66f497a5c7990d7e54cc1ae26995231ade55b86c (patch) (unidiff) | |
tree | c2e2a97a1ff6b40b8f76775a7479e0f19e7fce88 | |
parent | 9716f8c5672a8596306a9b432d9fabc4361baea5 (diff) | |
download | opie-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)
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 4 |
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 | |||
@@ -143,109 +143,109 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg | |||
143 | p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j ); | 143 | p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j ); |
144 | } | 144 | } |
145 | } | 145 | } |
146 | 146 | ||
147 | void BatteryStatus::paintEvent( QPaintEvent * ) { | 147 | void BatteryStatus::paintEvent( QPaintEvent * ) { |
148 | 148 | ||
149 | QPainter p(this); | 149 | QPainter p(this); |
150 | QString text; | 150 | QString text; |
151 | if ( ps->batteryStatus() == PowerStatus::Charging ) { | 151 | if ( ps->batteryStatus() == PowerStatus::Charging ) { |
152 | if (bat2) { | 152 | if (bat2) { |
153 | text = tr("Charging both devices"); | 153 | text = tr("Charging both devices"); |
154 | } else { | 154 | } else { |
155 | text = tr("Charging"); | 155 | text = tr("Charging"); |
156 | } | 156 | } |
157 | } else if ( ps->batteryPercentAccurate() ) { | 157 | } else if ( ps->batteryPercentAccurate() ) { |
158 | text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent ); | 158 | text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent ); |
159 | } else { | 159 | } else { |
160 | text = tr("Battery status: "); | 160 | text = tr("Battery status: "); |
161 | switch ( ps->batteryStatus() ) { | 161 | switch ( ps->batteryStatus() ) { |
162 | case PowerStatus::High: | 162 | case PowerStatus::High: |
163 | text += tr("Good"); | 163 | text += tr("Good"); |
164 | break; | 164 | break; |
165 | case PowerStatus::Low: | 165 | case PowerStatus::Low: |
166 | text += tr("Low"); | 166 | text += tr("Low"); |
167 | break; | 167 | break; |
168 | case PowerStatus::VeryLow: | 168 | case PowerStatus::VeryLow: |
169 | text += tr("Very Low"); | 169 | text += tr("Very Low"); |
170 | break; | 170 | break; |
171 | case PowerStatus::Critical: | 171 | case PowerStatus::Critical: |
172 | text += tr("Critical"); | 172 | text += tr("Critical"); |
173 | break; | 173 | break; |
174 | default: // NotPresent, etc. | 174 | default: // NotPresent, etc. |
175 | text += tr("Unknown"); | 175 | text += tr("Unknown"); |
176 | } | 176 | } |
177 | } | 177 | } |
178 | p.drawText( 10, 90, text ); | 178 | p.drawText( 10, 90, text ); |
179 | 179 | ||
180 | if ( ps->acStatus() == PowerStatus::Backup ) | 180 | if ( ps->acStatus() == PowerStatus::Backup ) |
181 | p.drawText( 10, 110, tr("On backup power") ); | 181 | p.drawText( 10, 110, tr("On backup power") ); |
182 | else if ( ps->acStatus() == PowerStatus::Online ) | 182 | else if ( ps->acStatus() == PowerStatus::Online ) |
183 | p.drawText( 10, 110, tr("Power on-line") ); | 183 | p.drawText( 10, 110, tr("Power on-line") ); |
184 | else if ( ps->acStatus() == PowerStatus::Offline ) | 184 | else if ( ps->acStatus() == PowerStatus::Offline ) |
185 | p.drawText( 10, 110, tr("External power disconnected") ); | 185 | p.drawText( 10, 110, tr("External power disconnected") ); |
186 | 186 | ||
187 | if ( ps->batteryTimeRemaining() >= 0 ) { | 187 | if ( ps->batteryTimeRemaining() >= 0 ) { |
188 | text.sprintf( tr("Battery time remaining") + ": %im %02is", | 188 | text.sprintf( tr("Battery time remaining") + ": %im %02is", |
189 | ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); | 189 | ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 ); |
190 | p.drawText( 10, 130, text ); | 190 | p.drawText( 10, 130, text ); |
191 | } | 191 | } |
192 | 192 | ||
193 | QColor c; | 193 | QColor c; |
194 | QColor darkc; | 194 | QColor darkc; |
195 | QColor lightc; | 195 | QColor lightc; |
196 | if ( ps->acStatus() == PowerStatus::Offline ) { | 196 | if ( ps->acStatus() == PowerStatus::Offline ) { |
197 | c = blue.light(120); | 197 | c = blue.light(120); |
198 | darkc = c.dark(280); | 198 | darkc = c.dark(280); |
199 | lightc = c.light(145); | 199 | lightc = c.light(145); |
200 | } else if ( ps->acStatus() == PowerStatus::Online ) { | 200 | } else if ( ps->acStatus() == PowerStatus::Online ) { |
201 | c = green.dark(130); | 201 | c = green.dark(130); |
202 | darkc = c.dark(200); | 202 | darkc = c.dark(200); |
203 | lightc = c.light(220); | 203 | lightc = c.light(220); |
204 | } else { | 204 | } else { |
205 | c = red; | 205 | c = red; |
206 | darkc = c.dark(280); | 206 | darkc = c.dark(280); |
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 | ||