author | zecke <zecke> | 2004-10-16 22:31:18 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-16 22:31:18 (UTC) |
commit | 4a623a9afe68f8d2d2f9562cb5ab589c0023519c (patch) (side-by-side diff) | |
tree | 63cfeb0e784db5dae6c93596cd07b04217ab4a22 /core/apps/helpbrowser/magictextbrowser.cpp | |
parent | 1633552a8816eaa18b2b06da6573611b2636cee8 (diff) | |
download | opie-4a623a9afe68f8d2d2f9562cb5ab589c0023519c.zip opie-4a623a9afe68f8d2d2f9562cb5ab589c0023519c.tar.gz opie-4a623a9afe68f8d2d2f9562cb5ab589c0023519c.tar.bz2 |
-Remove debug output on appMessage
-Check for Application Pages in help/lang/execname/execname.html as
well. This is needed for qashmoney and could be used for the
other help pages as well
Diffstat (limited to 'core/apps/helpbrowser/magictextbrowser.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/apps/helpbrowser/magictextbrowser.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/apps/helpbrowser/magictextbrowser.cpp b/core/apps/helpbrowser/magictextbrowser.cpp index 80495c9..44bf19f 100644 --- a/core/apps/helpbrowser/magictextbrowser.cpp +++ b/core/apps/helpbrowser/magictextbrowser.cpp @@ -80,17 +80,24 @@ QString MagicTextBrowser::generateQpe(const QString& name) const { AppLnkSet lnkset(dir); AppLnk* lnk; QString r; for (QListIterator<AppLnk> it(lnkset.children()); (lnk=it.current()); ++it) { QString name = lnk->name(); QString icon = lnk->icon(); - QString helpFile = lnk->exec()+".html"; + QString exec = lnk->exec(); + QString helpFile = exec+".html"; QStringList helpPath = Global::helpPath(); bool helpExists = FALSE; - for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) + for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) { helpExists = QFile::exists( *it + "/" + helpFile ); + + if( !helpExists && QFile::exists( *it + "/" + exec + "/" + helpFile ) ) { + helpFile = exec + "/" + helpFile; + helpExists = true; + } + } if ( helpExists ) { r += "<h3><a href="+helpFile+"><img src="+icon+">"+name+"</a></h3>\n"; } } return r; |