-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

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
@@ -118,7 +118,6 @@ void HelpBrowser::init( const QString& _home )
 
 void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data)
 {
-    odebug << "reached appMessage" << oendl;
     if ( msg == "showFile(QString)" ) {
     QDataStream ds(data,IO_ReadOnly);
     QString 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
@@ -83,12 +83,19 @@ QString MagicTextBrowser::generateQpe(const QString& name) const {
     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";
         }