summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/helpbrowser/helpbrowser.cpp1
-rw-r--r--core/apps/helpbrowser/magictextbrowser.cpp11
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
@@ -117,9 +117,8 @@ void HelpBrowser::init( const QString& _home )
117} 117}
118 118
119void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) 119void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data)
120{ 120{
121 odebug << "reached appMessage" << oendl;
122 if ( msg == "showFile(QString)" ) { 121 if ( msg == "showFile(QString)" ) {
123 QDataStream ds(data,IO_ReadOnly); 122 QDataStream ds(data,IO_ReadOnly);
124 QString fn; 123 QString fn;
125 ds >> fn; 124 ds >> 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
@@ -82,13 +82,20 @@ QString MagicTextBrowser::generateQpe(const QString& name) const {
82 QString r; 82 QString r;
83 for (QListIterator<AppLnk> it(lnkset.children()); (lnk=it.current()); ++it) { 83 for (QListIterator<AppLnk> it(lnkset.children()); (lnk=it.current()); ++it) {
84 QString name = lnk->name(); 84 QString name = lnk->name();
85 QString icon = lnk->icon(); 85 QString icon = lnk->icon();
86 QString helpFile = lnk->exec()+".html"; 86 QString exec = lnk->exec();
87 QString helpFile = exec+".html";
87 QStringList helpPath = Global::helpPath(); 88 QStringList helpPath = Global::helpPath();
88 bool helpExists = FALSE; 89 bool helpExists = FALSE;
89 for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) 90 for (QStringList::ConstIterator it=helpPath.begin(); it!=helpPath.end() && !helpExists; ++it) {
90 helpExists = QFile::exists( *it + "/" + helpFile ); 91 helpExists = QFile::exists( *it + "/" + helpFile );
92
93 if( !helpExists && QFile::exists( *it + "/" + exec + "/" + helpFile ) ) {
94 helpFile = exec + "/" + helpFile;
95 helpExists = true;
96 }
97 }
91 98
92 if ( helpExists ) { 99 if ( helpExists ) {
93 r += "<h3><a href="+helpFile+"><img src="+icon+">"+name+"</a></h3>\n"; 100 r += "<h3><a href="+helpFile+"><img src="+icon+">"+name+"</a></h3>\n";
94 } 101 }