summaryrefslogtreecommitdiff
path: root/library/global.cpp
authoreilers <eilers>2003-08-08 14:45:49 (UTC)
committer eilers <eilers>2003-08-08 14:45:49 (UTC)
commit14d394e6c107b037a09a31a92605034fe50f7813 (patch) (unidiff)
tree800699cf4dc9681c3eb023340634dd6a15fd04c8 /library/global.cpp
parentdbc6ea35f5535a1f69deb7ebbafc0f721721dbf2 (diff)
downloadopie-14d394e6c107b037a09a31a92605034fe50f7813.zip
opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.gz
opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.bz2
Merged branches from BRANCH_1_0
Diffstat (limited to 'library/global.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp24
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
@@ -562,15 +562,20 @@ void Global::invoke(const QString &c)
562 // If the channel is already register, the app is already running, so show it. 562 // If the channel is already register, the app is already running, so show it.
563 { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); } 563 { QCopEnvelope env( ("QPE/Application/" + ap).latin1(), "raise()" ); }
564 564
565 QCopEnvelope e("QPE/System", "notBusy(QString)" ); 565 //QCopEnvelope e("QPE/System", "notBusy(QString)" );
566 e << ap; 566 //e << ap;
567 return; 567 return;
568 } 568 }
569 // XXX should unlock file /tmp/qcop-msg-ap 569 // XXX should unlock file /tmp/qcop-msg-ap
570 //see if it is being started 570 //see if it is being started
571 if ( StartingAppList::isStarting( ap ) ) { 571 if ( StartingAppList::isStarting( ap ) ) {
572 QCopEnvelope e("QPE/System", "notBusy(QString)" ); 572 // FIXME take it out for now, since it leads to a much to short showing of wait if
573 e << ap; 573 // some entry is clicked.
574 // Real cause is that ::execute is called twice for document tab. But it would need some larger changes
575 // to fix that, and with future syncs with qtopia 1.6 it will change anyway big time since somebody there
576 // had the idea that an apploader belongs to the launcher ...
577 //QCopEnvelope e("QPE/System", "notBusy(QString)" );
578 //e << ap;
574 return; 579 return;
575 } 580 }
576 581
@@ -830,16 +835,19 @@ QStringList Global::languageList()
830 835
831QStringList Global::helpPath() 836QStringList Global::helpPath()
832{ 837{
838 QString qpeDir = QPEApplication::qpeDir();
833 QStringList path; 839 QStringList path;
834 QStringList langs = Global::languageList(); 840 QStringList langs = Global::languageList();
835 for (QStringList::ConstIterator it = langs.fromLast(); it!=langs.end(); --it) { 841 for (QStringList::ConstIterator it = langs.fromLast(); it!=langs.end(); --it) {
836 QString lang = *it; 842 QString lang = *it;
837 if ( !lang.isEmpty() ) 843 if ( !lang.isEmpty() )
838 path += QPEApplication::qpeDir() + "/help/" + lang + "/html"; 844 path += qpeDir + "/help/" + lang + "/html";
839 } 845 }
840 path += QPEApplication::qpeDir() + "/pics"; 846 path += qpeDir + "/pics";
841 path += QPEApplication::qpeDir() + "/help/html"; 847 path += qpeDir + "/help/html";
842 path += QPEApplication::qpeDir() + "/docs"; 848 /* we even put english into the en dir so try it as fallback as well for opie */
849 path += qpeDir + "/help/en/html";
850 path += qpeDir + "/docs";
843 851
844 852
845 return path; 853 return path;