-rw-r--r-- | core/launcher/server.cpp | 210 |
1 files changed, 106 insertions, 104 deletions
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp index 42186d3..15cd686 100644 --- a/core/launcher/server.cpp +++ b/core/launcher/server.cpp @@ -166,3 +166,3 @@ Server::Server() : connect( desktopChannel, SIGNAL(received( const QCString &, const QByteArray & )), - this, SLOT(desktopMessage( const QCString &, const QByteArray & )) ); + this, SLOT(desktopMessage( const QCString &, const QByteArray & )) ); #endif @@ -218,16 +218,16 @@ static bool hasVisibleWindow(const QString& clientname, bool partial) for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { - if ( w->client()->identity() == clientname ) { - if ( partial && !w->isFullyObscured() ) - return TRUE; - if ( !partial && !w->isFullyObscured() && !w->isPartiallyObscured() ) { + if ( w->client()->identity() == clientname ) { + if ( partial && !w->isFullyObscured() ) + return TRUE; + if ( !partial && !w->isFullyObscured() && !w->isPartiallyObscured() ) { # if QT_VERSION < 0x030000 - QRect mwr = qt_screen->mapToDevice(qt_maxWindowRect, - QSize(qt_screen->width(),qt_screen->height()) ); + QRect mwr = qt_screen->mapToDevice(qt_maxWindowRect, + QSize(qt_screen->width(),qt_screen->height()) ); # else - QRect mwr = qt_maxWindowRect; + QRect mwr = qt_maxWindowRect; # endif - if ( mwr.contains(w->requested().boundingRect()) ) - return TRUE; - } - } + if ( mwr.contains(w->requested().boundingRect()) ) + return TRUE; + } + } } @@ -344,2 +344,4 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) docList->linkChanged(link); + } else if (msg =="reforceDocuments()") { + docList->reforceDocuments(); } else if ( msg == "serviceChanged(QString)" ) { @@ -434,4 +436,4 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) #ifndef QT_NO_COP - QCopEnvelope e( "QPE/Desktop", "installLocations(QString)" ); - e << installLocationsString(); + QCopEnvelope e( "QPE/Desktop", "installLocations(QString)" ); + e << installLocationsString(); #endif @@ -472,5 +474,5 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data) else if ( msg == "prepareDirectAccess()" ) { - prepareDirectAccess(); + prepareDirectAccess(); } else if ( msg == "postDirectAccess()" ) { - postDirectAccess(); + postDirectAccess(); } @@ -559,18 +561,18 @@ QString Server::cardInfoString() for ( ; it.current(); ++it ) { - int k4 = (*it)->blockSize()/256; - if ( (*it)->isRemovable() ) { - s += (*it)->name() + "=" + (*it)->path() + "/Documents " // No tr - + QString::number( (*it)->availBlocks() * k4/4 ) - + "K " + (*it)->options() + ";"; - } else if ( homeDir.contains( (*it)->path() ) && - (*it)->path().length() > homeFsPath.length() ) { - homeFsPath = (*it)->path(); - homeFs = - (*it)->name() + "=" + homeDir + "/Documents " // No tr - + QString::number( (*it)->availBlocks() * k4/4 ) - + "K " + (*it)->options() + ";"; - } + int k4 = (*it)->blockSize()/256; + if ( (*it)->isRemovable() ) { + s += (*it)->name() + "=" + (*it)->path() + "/Documents " // No tr + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } else if ( homeDir.contains( (*it)->path() ) && + (*it)->path().length() > homeFsPath.length() ) { + homeFsPath = (*it)->path(); + homeFs = + (*it)->name() + "=" + homeDir + "/Documents " // No tr + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } } if ( !homeFs.isEmpty() ) - s += homeFs; + s += homeFs; return s; @@ -587,18 +589,18 @@ QString Server::installLocationsString() for ( ; it.current(); ++it ) { - int k4 = (*it)->blockSize()/256; - if ( (*it)->isRemovable() ) { - s += (*it)->name() + "=" + (*it)->path() + " " // No tr - + QString::number( (*it)->availBlocks() * k4/4 ) - + "K " + (*it)->options() + ";"; - } else if ( homeDir.contains( (*it)->path() ) && - (*it)->path().length() > homeFsPath.length() ) { - homeFsPath = (*it)->path(); - homeFs = - (*it)->name() + "=" + homeDir + " " // No tr - + QString::number( (*it)->availBlocks() * k4/4 ) - + "K " + (*it)->options() + ";"; - } + int k4 = (*it)->blockSize()/256; + if ( (*it)->isRemovable() ) { + s += (*it)->name() + "=" + (*it)->path() + " " // No tr + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } else if ( homeDir.contains( (*it)->path() ) && + (*it)->path().length() > homeFsPath.length() ) { + homeFsPath = (*it)->path(); + homeFs = + (*it)->name() + "=" + homeDir + " " // No tr + + QString::number( (*it)->availBlocks() * k4/4 ) + + "K " + (*it)->options() + ";"; + } } if ( !homeFs.isEmpty() ) - s = homeFs + s; + s = homeFs + s; return s; @@ -826,3 +828,3 @@ void Server::prepareDirectAccess() { - QCopEnvelope e( "QPE/Stabmon", "suspendMonitor()" ); + QCopEnvelope e( "QPE/Stabmon", "suspendMonitor()" ); } @@ -839,6 +841,6 @@ void Server::prepareDirectAccess() for ( QMap<int,QString>::ConstIterator it = - appLauncher->runningApplications().begin(); - it != appLauncher->runningApplications().end(); - ++it ) { - pendingFlushes++; + appLauncher->runningApplications().begin(); + it != appLauncher->runningApplications().end(); + ++it ) { + pendingFlushes++; } @@ -860,39 +862,39 @@ void Server::desktopMessage( const QCString &message, const QByteArray &data ) if ( message == "flushDone(QString)" ) { - QString app; - stream >> app; - qDebug( "flushDone from %s", app.latin1() ); - if ( --pendingFlushes == 0 ) { - qDebug( "pendingFlushes == 0, all the apps responded" ); - runDirectAccess(); - } + QString app; + stream >> app; + qDebug( "flushDone from %s", app.latin1() ); + if ( --pendingFlushes == 0 ) { + qDebug( "pendingFlushes == 0, all the apps responded" ); + runDirectAccess(); + } } else if ( message == "installStarted(QString)" ) { - QString package; - stream >> package; - qDebug( "\tInstall Started for package %s", package.latin1() ); + QString package; + stream >> package; + qDebug( "\tInstall Started for package %s", package.latin1() ); } else if ( message == "installStep(QString)" ) { - QString step; - stream >> step; - qDebug( "\tInstall Step %s", step.latin1() ); + QString step; + stream >> step; + qDebug( "\tInstall Step %s", step.latin1() ); } else if ( message == "installDone(QString)" ) { - QString package; - stream >> package; - qDebug( "\tInstall Finished for package %s", package.latin1() ); + QString package; + stream >> package; + qDebug( "\tInstall Finished for package %s", package.latin1() ); } else if ( message == "installFailed(QString,int,QString)" ) { - QString package, error; - int status; - stream >> package >> status >> error; - qDebug( "\tInstall Failed for package %s with error code %d and error message %s", - package.latin1(), status, error.latin1() ); + QString package, error; + int status; + stream >> package >> status >> error; + qDebug( "\tInstall Failed for package %s with error code %d and error message %s", + package.latin1(), status, error.latin1() ); } else if ( message == "removeStarted(QString)" ) { - QString package; - stream >> package; - qDebug( "\tRemove Started for package %s", package.latin1() ); + QString package; + stream >> package; + qDebug( "\tRemove Started for package %s", package.latin1() ); } else if ( message == "removeDone(QString)" ) { - QString package; - stream >> package; - qDebug( "\tRemove Finished for package %s", package.latin1() ); + QString package; + stream >> package; + qDebug( "\tRemove Finished for package %s", package.latin1() ); } else if ( message == "removeFailed(QString)" ) { - QString package; - stream >> package; - qDebug( "\tRemove Failed for package %s", package.latin1() ); + QString package; + stream >> package; + qDebug( "\tRemove Failed for package %s", package.latin1() ); } @@ -900,3 +902,3 @@ void Server::desktopMessage( const QCString &message, const QByteArray &data ) if ( qrr && qrr->waitingForMessages ) - qrr->desktopMessage( message, data ); + qrr->desktopMessage( message, data ); } @@ -911,3 +913,3 @@ void Server::runDirectAccess() if ( directAccessRun ) - return; + return; @@ -936,3 +938,3 @@ void Server::postDirectAccess() { - QCopEnvelope e( "QPE/Stabmon", "restartMonitor()" ); + QCopEnvelope e( "QPE/Stabmon", "restartMonitor()" ); } @@ -944,18 +946,18 @@ void Server::postDirectAccess() if ( !file->exists() ) { - delete file; - // Get rid of the dialog - if ( syncDialog ) { - delete syncDialog; - syncDialog = 0; - } + delete file; + // Get rid of the dialog + if ( syncDialog ) { + delete syncDialog; + syncDialog = 0; + } #warning FIXME support TempScreenSaverMode #if 0 - QPEApplication::setTempScreenSaverMode(QPEApplication::Enable); + QPEApplication::setTempScreenSaverMode(QPEApplication::Enable); #endif } else { - qrr = new QueuedRequestRunner( file, syncDialog ); - connect( qrr, SIGNAL(finished()), - this, SLOT(finishedQueuedRequests()) ); - QTimer::singleShot( 100, qrr, SLOT(process()) ); - // qrr will remove the sync dialog later + qrr = new QueuedRequestRunner( file, syncDialog ); + connect( qrr, SIGNAL(finished()), + this, SLOT(finishedQueuedRequests()) ); + QTimer::singleShot( 100, qrr, SLOT(process()) ); + // qrr will remove the sync dialog later } @@ -967,16 +969,16 @@ void Server::finishedQueuedRequests() if ( qrr->readyToDelete ) { - delete qrr; - qrr = 0; - // Get rid of the dialog - if ( syncDialog ) { - delete syncDialog; - syncDialog = 0; - } + delete qrr; + qrr = 0; + // Get rid of the dialog + if ( syncDialog ) { + delete syncDialog; + syncDialog = 0; + } #warning FIXME support TempScreenSaverMode #if 0 - QPEApplication::setTempScreenSaverMode(QPEApplication::Enable); + QPEApplication::setTempScreenSaverMode(QPEApplication::Enable); #endif } else { - qrr->readyToDelete = TRUE; - QTimer::singleShot( 0, this, SLOT(finishedQueuedRequests()) ); + qrr->readyToDelete = TRUE; + QTimer::singleShot( 0, this, SLOT(finishedQueuedRequests()) ); } |