| -rw-r--r-- | core/apps/helpbrowser/helpbrowser.cpp | 1 | ||||
| -rw-r--r-- | core/apps/helpbrowser/magictextbrowser.cpp | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index cbb4059..4bd9565 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp @@ -115,13 +115,12 @@ void HelpBrowser::init( const QString& _home ) connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(appMessage(const QCString&,const QByteArray&)) ); } void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) { - odebug << "reached appMessage" << oendl; if ( msg == "showFile(QString)" ) { QDataStream ds(data,IO_ReadOnly); QString fn; ds >> fn; setDocument( fn ); 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; |