- improve BigScreen on ShutDown

1 files changed, 138 insertions, 140 deletions

diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 807942d..54cc313 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -97,12 +97,12 @@ class DesktopPowerAlerter : public QMessageBox
 public:
     DesktopPowerAlerter( QWidget *parent, const char *name = 0 )
-        : QMessageBox( tr("Battery Status"), tr("Low Battery"),
-                       QMessageBox::Critical,
-                       QMessageBox::Ok | QMessageBox::Default,
-                       QMessageBox::NoButton, QMessageBox::NoButton,
-                       parent, name, FALSE )
+    : QMessageBox( tr("Battery Status"), tr("Low Battery"),
+               QMessageBox::Critical,
+               QMessageBox::Ok | QMessageBox::Default,
+               QMessageBox::NoButton, QMessageBox::NoButton,
+               parent, name, FALSE )
     {
-        currentPriority = INT_MAX;
-        alertCount = 0;
+    currentPriority = INT_MAX;
+    alertCount = 0;
     }
 
@@ -118,7 +118,7 @@ void DesktopPowerAlerter::alert( const QString &text, int priority )
     alertCount++;
     if ( alertCount < priority )
-        return;
+    return;
     if ( priority > currentPriority )
-        return;
+    return;
     currentPriority = priority;
     setText( text );
@@ -147,11 +147,11 @@ void KeyFilter::timerEvent(QTimerEvent* e)
 {
     if ( e->timerId() == held_tid ) {
-        killTimer(held_tid);
-        // button held
-        if ( heldButton ) {
-            emit activate(heldButton, TRUE);
-            heldButton = 0;
-        }
-        held_tid = 0;
+    killTimer(held_tid);
+    // button held
+    if ( heldButton ) {
+        emit activate(heldButton, TRUE);
+        heldButton = 0;
+    }
+    held_tid = 0;
     }
 }
@@ -179,15 +179,15 @@ bool KeyFilter::checkButtonAction(bool db, int keycode,  int press, int autoRepe
 {
     if ( !loggedin
-            // Permitted keys
-            && keycode != Key_F34 // power
-            && keycode != Key_F30 // select
-            && keycode != Key_Enter
-            && keycode != Key_Return
-            && keycode != Key_Space
-            && keycode != Key_Left
-            && keycode != Key_Right
-            && keycode != Key_Up
-            && keycode != Key_Down )
-        return TRUE;
+        // Permitted keys
+        && keycode != Key_F34 // power
+        && keycode != Key_F30 // select
+        && keycode != Key_Enter
+        && keycode != Key_Return
+        && keycode != Key_Space
+        && keycode != Key_Left
+        && keycode != Key_Right
+        && keycode != Key_Up
+        && keycode != Key_Down )
+    return TRUE;
 
         /* check if it was registered */
@@ -321,5 +321,5 @@ ServerApplication::ServerApplication( int& argc, char **argv, Type t )
 #if 0
     if ( PluginLoader::inSafeMode() )
-        QTimer::singleShot(500, this, SLOT(showSafeMode()) );
+    QTimer::singleShot(500, this, SLOT(showSafeMode()) );
     QTimer::singleShot(20*1000, this, SLOT(clearSafeMode()) );
 #endif
@@ -380,13 +380,13 @@ void ServerApplication::apmTimeout() {
     if ( bat < m_ps_last-> batteryPercentRemaining() ) {
         if ( bat <= m_powerCritical ) {
-            QMessageBox battlow(
-                tr("WARNING"),
-                tr("<p>The battery level is critical!"
-                    "<p>Keep power off until AC is restored"),
-                QMessageBox::Warning,
-                QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
-                0, QString::null, TRUE, WStyle_StaysOnTop);
-            battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
-            battlow.exec();
+        QMessageBox battlow(
+        tr("WARNING"),
+        tr("<p>The battery level is critical!"
+            "<p>Keep power off until AC is restored"),
+        QMessageBox::Warning,
+        QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
+        0, QString::null, TRUE, WStyle_StaysOnTop);
+        battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
+        battlow.exec();
         } else if ( bat <= m_powerVeryLow )
             pa->alert( tr( "The battery is running very low. "), 2 );
@@ -394,13 +394,13 @@ void ServerApplication::apmTimeout() {
 
     if ( m_ps-> backupBatteryStatus() == PowerStatus::VeryLow ) {
-            QMessageBox battlow(
-                tr("WARNING"),
-                tr("<p>The Back-up battery is very low"
-                    "<p>Please charge the back-up battery"),
-                QMessageBox::Warning,
-                QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
-                0, QString::null, TRUE, WStyle_StaysOnTop);
-            battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
-            battlow.exec();
+        QMessageBox battlow(
+        tr("WARNING"),
+        tr("<p>The Back-up battery is very low"
+            "<p>Please charge the back-up battery"),
+        QMessageBox::Warning,
+        QMessageBox::Cancel, QMessageBox::NoButton, QMessageBox::NoButton,
+        0, QString::null, TRUE, WStyle_StaysOnTop);
+        battlow.setButtonText(QMessageBox::Cancel, tr("Ok"));
+        battlow.exec();
     }
 }
@@ -496,9 +496,9 @@ void ServerApplication::login(bool at_poweron)
 {
     if ( !loggedin ) {
-        Global::terminateBuiltin("calibrate"); // No tr
-        Password::authenticate(at_poweron);
-        loggedin=1;
+    Global::terminateBuiltin("calibrate"); // No tr
+    Password::authenticate(at_poweron);
+    loggedin=1;
 #ifndef QT_NO_COP
-        QCopEnvelope e( "QPE/Desktop", "unlocked()" );
+    QCopEnvelope e( "QPE/Desktop", "unlocked()" );
 #endif
     }
@@ -548,18 +548,18 @@ namespace {
     void execAutoStart(const QDateTime& suspendTime ) {
         QString appName;
-        int delay;
-        QDateTime now = QDateTime::currentDateTime();
+    int delay;
+    QDateTime now = QDateTime::currentDateTime();
 
         Config cfg( "autostart" );
-        cfg.setGroup( "AutoStart" );
-        appName = cfg.readEntry( "Apps", "" );
-        delay = cfg.readNumEntry( "Delay", 0  );
-
-        // If the time between suspend and resume was longer then the
-        // value saved as delay, start the app
-        if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
-                QCopEnvelope e( "QPE/System", "execute(QString)" );
-                e << QString( appName );
-        }
+    cfg.setGroup( "AutoStart" );
+    appName = cfg.readEntry( "Apps", "" );
+    delay = cfg.readNumEntry( "Delay", 0  );
+
+    // If the time between suspend and resume was longer then the
+    // value saved as delay, start the app
+    if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) {
+        QCopEnvelope e( "QPE/System", "execute(QString)" );
+        e << QString( appName );
+    }
     }
 }
@@ -568,42 +568,42 @@ namespace {
 void ServerApplication::togglePower()
 {
-        static bool excllock = false;
+    static bool excllock = false;
 
-        if ( excllock )
-                return ;
+    if ( excllock )
+        return ;
 
-        excllock = true;
+    excllock = true;
 
-        bool wasloggedin = loggedin;
-        loggedin = 0;
-        m_suspendTime = QDateTime::currentDateTime();
+    bool wasloggedin = loggedin;
+    loggedin = 0;
+    m_suspendTime = QDateTime::currentDateTime();
 
 #ifdef QWS
 
-        if ( Password::needToAuthenticate ( true ) && qt_screen ) {
-                // Should use a big black window instead.
-                // But this would not show up fast enough
-                QGfx *g = qt_screen-> screenGfx ( );
-                g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
-                delete g;
-        }
+    if ( Password::needToAuthenticate ( true ) && qt_screen ) {
+        // Should use a big black window instead.
+        // But this would not show up fast enough
+        QGfx *g = qt_screen-> screenGfx ( );
+        g-> fillRect ( 0, 0, qt_screen-> width ( ), qt_screen-> height ( ));
+        delete g;
+    }
 #endif
 
-        ODevice::inst ( )-> suspend ( );
+    ODevice::inst ( )-> suspend ( );
 
-        ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call
-        QWSServer::screenSaverActivate ( false );
+    ServerApplication::switchLCD ( true ); // force LCD on without slow qcop call
+    QWSServer::screenSaverActivate ( false );
 
-        {
-                QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
-        }
+    {
+        QCopEnvelope( "QPE/Card", "mtabChanged()" ); // might have changed while asleep
+    }
 
-        if ( wasloggedin )
-                login ( true );
+    if ( wasloggedin )
+        login ( true );
 
-        execAutoStart(m_suspendTime);
-        //qcopBridge->closeOpenConnections();
+    execAutoStart(m_suspendTime);
+    //qcopBridge->closeOpenConnections();
 
-        excllock = false;
+    excllock = false;
 }
 
@@ -643,15 +643,15 @@ bool ServerApplication::qwsEventFilter( QWSEvent *e )
 
     if ( e->type == QWSEvent::Mouse ) {
-        QWSMouseEvent *me = (QWSMouseEvent *)e;
-        static bool up = TRUE;
-        if ( me->simpleData.state&LeftButton ) {
-            if ( up ) {
-                up = FALSE;
-                screenClick(TRUE);
-            }
-        } else if ( !up ) {
-            up = TRUE;
-            screenClick(FALSE);
-        }
+    QWSMouseEvent *me = (QWSMouseEvent *)e;
+    static bool up = TRUE;
+    if ( me->simpleData.state&LeftButton ) {
+        if ( up ) {
+        up = FALSE;
+        screenClick(TRUE);
+        }
+    } else if ( !up ) {
+        up = TRUE;
+        screenClick(FALSE);
+    }
     }else if ( e->type == QWSEvent::Key ) {
         QWSKeyEvent * ke = static_cast<QWSKeyEvent*>( e );
@@ -674,9 +674,9 @@ void ServerApplication::showSafeMode()
 #if 0
     if ( QMessageBox::warning(0, tr("Safe Mode"), tr("<P>A system startup error occurred, "
-                "and the system is now in Safe Mode. "
-                "Plugins are not loaded in Safe Mode. "
-                "You can use the Plugin Manager to "
-                "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) {
-        Global::execute( "pluginmanager" );
+        "and the system is now in Safe Mode. "
+        "Plugins are not loaded in Safe Mode. "
+        "You can use the Plugin Manager to "
+        "disable plugins that cause system error."), tr("OK"), tr("Plugin Manager..."), 0) == 1 ) {
+    Global::execute( "pluginmanager" );
     }
 #endif
@@ -692,5 +692,5 @@ void ServerApplication::clearSafeMode()
     QString mode = cfg.readEntry( "Mode", "Normal" );
     if ( mode == "MaybeSafe" ) {
-        cfg.writeEntry( "Mode", "Normal" );
+    cfg.writeEntry( "Mode", "Normal" );
     }
 #endif
@@ -701,11 +701,9 @@ void ServerApplication::shutdown()
 {
     if ( type() != GuiServer )
-        return;
+    return;
     ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose );
     connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)),
-             this, SLOT(shutdown(ShutdownImpl::Type)) );
+         this, SLOT(shutdown(ShutdownImpl::Type)) );
     QPEApplication::showWidget( sd );
-        sd->move(0,0);
-
 }
 
@@ -724,5 +722,5 @@ void ServerApplication::shutdown( ShutdownImpl::Type t )
         if ( execl( "/sbin/shutdown", "shutdown", opt, "now", ( void* ) 0) < 0 )
             perror("shutdown");
-        //                              ::syslog ( LOG_ERR, "Erroring execing shutdown\n" );
+//                      ::syslog ( LOG_ERR, "Erroring execing shutdown\n" );
 
         break;
@@ -758,11 +756,11 @@ void ServerApplication::restart()
         /* same as above */
         emit aboutToQuit();
-        prepareForTermination(TRUE);
-        doRestart = TRUE;
-        quit();
+    prepareForTermination(TRUE);
+    doRestart = TRUE;
+    quit();
 #else
         prepareForTermination( true );
         for ( int fd = 3; fd < 100; fd++ )
-                close( fd );
+        close( fd );
         execl( ( qpeDir() + "/bin/qpe" ).latin1(), "qpe", 0 );
         exit( 1 );
@@ -789,33 +787,33 @@ void ServerApplication::checkMemory()
 
     if(existingMessage)
-        return; // don't show a second message while still on first
+    return; // don't show a second message while still on first
 
     existingMessage = TRUE;
     switch ( memstate ) {
-        case MemUnknown:
-            break;
-        case MemLow:
-            memstate = MemUnknown;
-            if ( !recoverMemory() ) {
-                QMessageBox::warning( 0 , tr("Memory Status"),
-                    tr("Memory Low\nPlease save data.") );
-                ignoreNormal = FALSE;
-            }
-            break;
-        case MemNormal:
-            memstate = MemUnknown;
-            if ( !ignoreNormal ) {
-                ignoreNormal = TRUE;
-                QMessageBox::information ( 0 , tr("Memory Status"),
-                    "Memory OK" );
-            }
-            break;
-        case MemVeryLow:
-            memstate = MemUnknown;
-            QMessageBox::critical( 0 , tr("Memory Status"),
-                tr("Critical Memory Shortage\n"
-                "Please end this application\n"
-                "immediately.") );
-            recoverMemory();
+    case MemUnknown:
+        break;
+    case MemLow:
+        memstate = MemUnknown;
+        if ( !recoverMemory() ) {
+        QMessageBox::warning( 0 , tr("Memory Status"),
+            tr("Memory Low\nPlease save data.") );
+        ignoreNormal = FALSE;
+        }
+        break;
+    case MemNormal:
+        memstate = MemUnknown;
+        if ( !ignoreNormal ) {
+        ignoreNormal = TRUE;
+        QMessageBox::information ( 0 , tr("Memory Status"),
+            "Memory OK" );
+        }
+        break;
+    case MemVeryLow:
+        memstate = MemUnknown;
+        QMessageBox::critical( 0 , tr("Memory Status"),
+        tr("Critical Memory Shortage\n"
+        "Please end this application\n"
+        "immediately.") );
+        recoverMemory();
     }
     existingMessage = FALSE;
@@ -848,5 +846,5 @@ void ServerApplication::soundAlarm() {
 ServerApplication *ServerApplication::me ( )
 {
-        return static_cast<ServerApplication*>( qApp );
+    return static_cast<ServerApplication*>( qApp );
 }