summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-11-20 14:11:45 (UTC)
committer mickeyl <mickeyl>2003-11-20 14:11:45 (UTC)
commitf43e28fe8f226039d96ebda4e6c4d26e4f3320ba (patch) (unidiff)
tree3a312c1333e53b0c674c3b1a682226dd80917f5c
parentae9e1ed9cc9e65c1ffb28f3b75ff499e18c6b31a (diff)
downloadopie-f43e28fe8f226039d96ebda4e6c4d26e4f3320ba.zip
opie-f43e28fe8f226039d96ebda4e6c4d26e4f3320ba.tar.gz
opie-f43e28fe8f226039d96ebda4e6c4d26e4f3320ba.tar.bz2
fix battery message box text wrapping
patch courtesy of Matthias Hentges - thanks.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp36
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
@@ -366,26 +366,44 @@ void ServerApplication::apmTimeout() {
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
388void ServerApplication::systemMessage( const QCString& msg, 406void 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