author | mickeyl <mickeyl> | 2003-11-20 14:11:45 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-11-20 14:11:45 (UTC) |
commit | f43e28fe8f226039d96ebda4e6c4d26e4f3320ba (patch) (unidiff) | |
tree | 3a312c1333e53b0c674c3b1a682226dd80917f5c | |
parent | ae9e1ed9cc9e65c1ffb28f3b75ff499e18c6b31a (diff) | |
download | opie-f43e28fe8f226039d96ebda4e6c4d26e4f3320ba.zip opie-f43e28fe8f226039d96ebda4e6c4d26e4f3320ba.tar.gz opie-f43e28fe8f226039d96ebda4e6c4d26e4f3320ba.tar.bz2 |
fix battery message box text wrapping
patch courtesy of Matthias Hentges - thanks.
-rw-r--r-- | core/launcher/serverapp.cpp | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp index 23a7f95..e8d49fd 100644 --- a/core/launcher/serverapp.cpp +++ b/core/launcher/serverapp.cpp | |||
@@ -340,78 +340,96 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t ) | |||
340 | SLOT(togglePower() ) ); | 340 | SLOT(togglePower() ) ); |
341 | 341 | ||
342 | rereadVolumes(); | 342 | rereadVolumes(); |
343 | 343 | ||
344 | serverApp = this; | 344 | serverApp = this; |
345 | 345 | ||
346 | apmTimeout(); | 346 | apmTimeout(); |
347 | grabKeyboard(); | 347 | grabKeyboard(); |
348 | 348 | ||
349 | /* make sure the event filter is installed */ | 349 | /* make sure the event filter is installed */ |
350 | const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 ); | 350 | const Opie::ODeviceButton* but = Opie::ODevice::inst()->buttonForKeycode( -1 ); |
351 | } | 351 | } |
352 | 352 | ||
353 | 353 | ||
354 | ServerApplication::~ServerApplication() | 354 | ServerApplication::~ServerApplication() |
355 | { | 355 | { |
356 | ungrabKeyboard(); | 356 | ungrabKeyboard(); |
357 | 357 | ||
358 | 358 | ||
359 | delete pa; | 359 | delete pa; |
360 | delete m_ps; | 360 | delete m_ps; |
361 | delete m_ps_last; | 361 | delete m_ps_last; |
362 | } | 362 | } |
363 | 363 | ||
364 | void ServerApplication::apmTimeout() { | 364 | void ServerApplication::apmTimeout() { |
365 | serverApp-> checkMemory( ); // in case no events are generated | 365 | serverApp-> checkMemory( ); // in case no events are generated |
366 | *m_ps_last = *m_ps; | 366 | *m_ps_last = *m_ps; |
367 | *m_ps = PowerStatusManager::readStatus(); | 367 | *m_ps = PowerStatusManager::readStatus(); |
368 | 368 | ||
369 | if ( m_ps->acStatus() != m_ps_last-> acStatus() ) | 369 | if ( m_ps->acStatus() != m_ps_last-> acStatus() ) |
370 | m_screensaver-> powerStatusChanged( *m_ps ); | 370 | m_screensaver-> powerStatusChanged( *m_ps ); |
371 | 371 | ||
372 | if ( m_ps->acStatus() == PowerStatus::Online ) | 372 | if ( m_ps->acStatus() == PowerStatus::Online ) { |
373 | return; | 373 | return; |
374 | 374 | } | |
375 | |||
375 | int bat = m_ps-> batteryPercentRemaining(); | 376 | int bat = m_ps-> batteryPercentRemaining(); |
376 | 377 | ||
377 | if ( bat < m_ps_last-> batteryPercentRemaining() ) { | 378 | if ( bat < m_ps_last-> batteryPercentRemaining() ) { |
378 | if ( bat <= m_powerCritical ) | 379 | if ( bat <= m_powerCritical ) { |
379 | pa->alert( tr( "Battery level is critical!\nKeep power off until power restored!" ), 1 ); | 380 | QMessageBox battlow( |
380 | else if ( bat <= m_powerVeryLow ) | 381 | tr("WARNING"), |
381 | pa->alert( tr( "Battery is running very low. "), 2 ); | 382 | tr("<p>The battery level is critical!" |
383 | "<p>Keep power off until AC is restored"), | ||
384 | QMessageBox::Warning, | ||
385 | QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, | ||
386 | 0, QString::null, TRUE, WStyle_StaysOnTop); | ||
387 | battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); | ||
388 | battlow.exec(); | ||
389 | } else if ( bat <= m_powerVeryLow ) | ||
390 | pa->alert( tr( "The battery is running very low. "), 2 ); | ||
382 | } | 391 | } |
383 | if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) | 392 | |
384 | pa->alert( tr("The Back-up battery is very low.\nPlease charge the back-up battery." ), 2); | 393 | if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) { |
385 | 394 | QMessageBox battlow( | |
395 | tr("WARNING"), | ||
396 | tr("<p>The Back-up battery is very low" | ||
397 | "<p>Please charge the back-up battery"), | ||
398 | QMessageBox::Warning, | ||
399 | QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton, | ||
400 | 0, QString::null, TRUE, WStyle_StaysOnTop); | ||
401 | battlow.setButtonText(QMessageBox::Cancel, tr("Ok")); | ||
402 | battlow.exec(); | ||
403 | } | ||
386 | } | 404 | } |
387 | 405 | ||
388 | void ServerApplication::systemMessage( const QCString& msg, | 406 | void ServerApplication::systemMessage( const QCString& msg, |
389 | const QByteArray& data ) { | 407 | const QByteArray& data ) { |
390 | QDataStream stream ( data, IO_ReadOnly ); | 408 | QDataStream stream ( data, IO_ReadOnly ); |
391 | 409 | ||
392 | if ( msg == "setScreenSaverInterval(int)" ) { | 410 | if ( msg == "setScreenSaverInterval(int)" ) { |
393 | int time; | 411 | int time; |
394 | stream >> time; | 412 | stream >> time; |
395 | m_screensaver-> setInterval( time ); | 413 | m_screensaver-> setInterval( time ); |
396 | } | 414 | } |
397 | else if ( msg == "setScreenSaverIntervals(int,int,int)" ) { | 415 | else if ( msg == "setScreenSaverIntervals(int,int,int)" ) { |
398 | int t1, t2, t3; | 416 | int t1, t2, t3; |
399 | stream >> t1 >> t2 >> t3; | 417 | stream >> t1 >> t2 >> t3; |
400 | m_screensaver-> setIntervals( t1, t2, t3 ); | 418 | m_screensaver-> setIntervals( t1, t2, t3 ); |
401 | } | 419 | } |
402 | else if ( msg == "setBacklight(int)" ) { | 420 | else if ( msg == "setBacklight(int)" ) { |
403 | int bright; | 421 | int bright; |
404 | stream >> bright; | 422 | stream >> bright; |
405 | m_screensaver-> setBacklight( bright ); | 423 | m_screensaver-> setBacklight( bright ); |
406 | } | 424 | } |
407 | else if ( msg == "setScreenSaverMode(int)" ) { | 425 | else if ( msg == "setScreenSaverMode(int)" ) { |
408 | int mode; | 426 | int mode; |
409 | stream >> mode; | 427 | stream >> mode; |
410 | m_screensaver-> setMode ( mode ); | 428 | m_screensaver-> setMode ( mode ); |
411 | } | 429 | } |
412 | else if ( msg == "reloadPowerWarnSettings()" ) { | 430 | else if ( msg == "reloadPowerWarnSettings()" ) { |
413 | reloadPowerWarnSettings(); | 431 | reloadPowerWarnSettings(); |
414 | } | 432 | } |
415 | else if ( msg == "setDisplayState(int)" ) { | 433 | else if ( msg == "setDisplayState(int)" ) { |
416 | int state; | 434 | int state; |
417 | stream >> state; | 435 | stream >> state; |