author | llornkcor <llornkcor> | 2002-10-10 13:31:57 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-10 13:31:57 (UTC) |
commit | c82a7868e0e2f8dc3e3d2b42629fc8d8efef05c7 (patch) (unidiff) | |
tree | 46c91fad5a5869d7ca146cf78c74a02d04eb083a | |
parent | 798474a96ae42503b9d73444d7a4c05d6af5bc10 (diff) | |
download | opie-c82a7868e0e2f8dc3e3d2b42629fc8d8efef05c7.zip opie-c82a7868e0e2f8dc3e3d2b42629fc8d8efef05c7.tar.gz opie-c82a7868e0e2f8dc3e3d2b42629fc8d8efef05c7.tar.bz2 |
enough memory again mesage is silly and annoying, and takes up memory in low memory situations
-rw-r--r-- | core/launcher/desktop.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 1a33b36..6ee7132 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -318,21 +318,21 @@ private: | |||
318 | 318 | ||
319 | void DesktopApplication::switchLCD ( bool on ) | 319 | void DesktopApplication::switchLCD ( bool on ) |
320 | { | 320 | { |
321 | if ( qApp ) { | 321 | if ( qApp ) { |
322 | DesktopApplication *dapp = (DesktopApplication *) qApp; | 322 | DesktopApplication *dapp = (DesktopApplication *) qApp; |
323 | 323 | ||
324 | if ( dapp-> m_screensaver ) { | 324 | if ( dapp-> m_screensaver ) { |
325 | if ( on ) | 325 | if ( on ) |
326 | dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 ); | 326 | dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 ); |
327 | else | 327 | else |
328 | dapp-> m_screensaver-> save ( 1 ); | 328 | dapp-> m_screensaver-> save ( 1 ); |
329 | 329 | ||
330 | } | 330 | } |
331 | } | 331 | } |
332 | } | 332 | } |
333 | 333 | ||
334 | 334 | ||
335 | DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) | 335 | DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) |
336 | : QPEApplication( argc, argv, appType ) | 336 | : QPEApplication( argc, argv, appType ) |
337 | { | 337 | { |
338 | 338 | ||
@@ -376,17 +376,17 @@ void DesktopApplication::desktopMessage( const QCString &msg, const QByteArray & | |||
376 | 376 | ||
377 | qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m ); | 377 | qWarning( "KeyRegisterReceived: %i, %s, %s", k, ( const char* ) c, ( const char * ) m ); |
378 | keyRegisterList.append( QCopKeyRegister( k, c, m ) ); | 378 | keyRegisterList.append( QCopKeyRegister( k, c, m ) ); |
379 | } | 379 | } |
380 | else if ( msg == "suspend()" ) { | 380 | else if ( msg == "suspend()" ) { |
381 | emit power(); | 381 | emit power(); |
382 | } | 382 | } |
383 | else if ( msg == "home()" ) { | 383 | else if ( msg == "home()" ) { |
384 | qpedesktop-> home ( ); | 384 | qpedesktop-> home ( ); |
385 | } | 385 | } |
386 | #endif | 386 | #endif |
387 | } | 387 | } |
388 | 388 | ||
389 | 389 | ||
390 | void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data ) | 390 | void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & data ) |
391 | { | 391 | { |
392 | #ifdef Q_WS_QWS | 392 | #ifdef Q_WS_QWS |
@@ -670,19 +670,19 @@ void Desktop::checkMemory() | |||
670 | QMessageBox::warning( 0 , "Memory Status", | 670 | QMessageBox::warning( 0 , "Memory Status", |
671 | "The memory smacks of shortage. \n" | 671 | "The memory smacks of shortage. \n" |
672 | "Please save data. " ); | 672 | "Please save data. " ); |
673 | break; | 673 | break; |
674 | case Normal: | 674 | case Normal: |
675 | memstate = Unknown; | 675 | memstate = Unknown; |
676 | if ( ignoreNormal ) | 676 | if ( ignoreNormal ) |
677 | ignoreNormal = FALSE; | 677 | ignoreNormal = FALSE; |
678 | else | 678 | // else |
679 | QMessageBox::information ( 0 , "Memory Status", | 679 | // QMessageBox::information ( 0 , "Memory Status", |
680 | "There is enough memory again." ); | 680 | // "There is enough memory again." ); |
681 | break; | 681 | break; |
682 | case VeryLow: | 682 | case VeryLow: |
683 | memstate = Unknown; | 683 | memstate = Unknown; |
684 | QMessageBox::critical( 0 , "Memory Status", | 684 | QMessageBox::critical( 0 , "Memory Status", |
685 | "The memory is very low. \n" | 685 | "The memory is very low. \n" |
686 | "Please end this application \n" | 686 | "Please end this application \n" |
687 | "immediately." ); | 687 | "immediately." ); |
688 | recoverMemory(); | 688 | recoverMemory(); |
@@ -715,26 +715,26 @@ static bool hasVisibleWindow( const QString& clientname ) | |||
715 | 715 | ||
716 | void Desktop::raiseLauncher() | 716 | void Desktop::raiseLauncher() |
717 | { | 717 | { |
718 | Config cfg( "qpe" ); //F12 'Home' | 718 | Config cfg( "qpe" ); //F12 'Home' |
719 | cfg.setGroup( "AppsKey" ); | 719 | cfg.setGroup( "AppsKey" ); |
720 | QString tempItem; | 720 | QString tempItem; |
721 | tempItem = cfg.readEntry( "Middle", "Home" ); | 721 | tempItem = cfg.readEntry( "Middle", "Home" ); |
722 | if ( tempItem == "Home" || tempItem.isEmpty() ) { | 722 | if ( tempItem == "Home" || tempItem.isEmpty() ) { |
723 | home ( ); | 723 | home ( ); |
724 | } | 724 | } |
725 | else { | 725 | else { |
726 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 726 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
727 | e << tempItem; | 727 | e << tempItem; |
728 | } | 728 | } |
729 | } | 729 | } |
730 | 730 | ||
731 | void Desktop::home ( ) | 731 | void Desktop::home ( ) |
732 | { | 732 | { |
733 | if ( isVisibleWindow( launcher->winId() ) ) | 733 | if ( isVisibleWindow( launcher->winId() ) ) |
734 | launcher->nextView(); | 734 | launcher->nextView(); |
735 | else | 735 | else |
736 | launcher->raise(); | 736 | launcher->raise(); |
737 | } | 737 | } |
738 | 738 | ||
739 | void Desktop::executeOrModify( const QString& appLnkFile ) | 739 | void Desktop::executeOrModify( const QString& appLnkFile ) |
740 | { | 740 | { |