| -rw-r--r-- | library/global.cpp | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/library/global.cpp b/library/global.cpp index ce39751..189b830 100644 --- a/library/global.cpp +++ b/library/global.cpp @@ -563,6 +563,6 @@ void Global::invoke(const QString &c) { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } - QCopEnvelope e("QPE/System", "notBusy(QString)" ); - e << ap; + //QCopEnvelope e("QPE/System", "notBusy(QString)" ); + //e << ap; return; } @@ -570,6 +570,11 @@ void Global::invoke(const QString &c) //see if it is being started if ( StartingAppList::isStarting( ap ) ) { - QCopEnvelope e("QPE/System", "notBusy(QString)" ); - e << ap; + // FIXME take it out for now, since it leads to a much to short showing of wait if + // some entry is clicked. + // Real cause is that ::execute is called twice for document tab. But it would need some larger changes + // to fix that, and with future syncs with qtopia 1.6 it will change anyway big time since somebody there + // had the idea that an apploader belongs to the launcher ... + //QCopEnvelope e("QPE/System", "notBusy(QString)" ); + //e << ap; return; } @@ -831,4 +836,5 @@ QStringList Global::languageList() QStringList Global::helpPath() { + QString qpeDir = QPEApplication::qpeDir(); QStringList path; QStringList langs = Global::languageList(); @@ -836,9 +842,11 @@ QStringList Global::helpPath() QString lang = *it; if ( !lang.isEmpty() ) - path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; + path += qpeDir + "/help/" + lang + "/html"; } - path += QPEApplication::qpeDir() + "/pics"; - path += QPEApplication::qpeDir() + "/help/html"; - path += QPEApplication::qpeDir() + "/docs"; + path += qpeDir + "/pics"; + path += qpeDir + "/help/html"; + /* we even put english into the en dir so try it as fallback as well for opie */ + path += qpeDir + "/help/en/html"; + path += qpeDir + "/docs"; |