From ca353a263b936054f0f8f9812be312ac87a37411 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 20 Apr 2008 18:29:05 +0000 Subject: porting help module (wip) git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1539 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/help/libkvihelp.cpp | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) (limited to 'src/modules/help/libkvihelp.cpp') diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index db8fef16e..647418716 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -33,12 +33,9 @@ #include "kvi_frame.h" -#ifdef COMPILE_USE_QT4 - #include -#endif - +#include +#include -#include Index * g_pDocIndex = 0; KviPointerList * g_pHelpWidgetList = 0; KviPointerList * g_pHelpWindowList = 0; @@ -141,20 +138,22 @@ static bool help_kvs_cmd_search(KviKvsModuleCommandCall * c) static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) { - QString doc; + QString doc, szHelpDir; + KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("document",KVS_PT_STRING,KVS_PF_OPTIONAL,doc) KVSM_PARAMETERS_END(c) - if(doc.isEmpty())doc = "index.html"; -#ifdef COMPILE_USE_QT4 - Q3MimeSourceFactory * f = Q3MimeSourceFactory::defaultFactory(); -#else - QMimeSourceFactory * f = QMimeSourceFactory::defaultFactory(); -#endif + + g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help); + + if(doc.isEmpty())doc = szHelpDir + "/index.html"; + else doc = szHelpDir + "/" + doc; + + QFileInfo * f= new QFileInfo(doc); if(f) { - if(!f->data(doc)) - doc = "nohelpavailable.html"; + if(!f->exists()) + doc = szHelpDir + "/nohelpavailable.html"; } if(!c->switches()->find('n',"new")) @@ -162,21 +161,20 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->child("help_widget","KviHelpWidget"); if(w) { - w->textBrowser()->setSource(doc); + w->textBrowser()->setSource(QUrl(doc)); return true; } } if(c->switches()->find('m',"mdi")) { KviHelpWindow *w = new KviHelpWindow(c->window()->frame(),"Help browser"); - w->textBrowser()->setSource(doc); + w->textBrowser()->setSource(QUrl(doc)); c->window()->frame()->addWindow(w); } else { KviHelpWidget *w = new KviHelpWidget(c->window()->frame()->splitter(), c->window()->frame(),true); - w->textBrowser()->setSource(doc); + w->textBrowser()->setSource(QUrl(doc)); w->show(); - //debug ("mostro"); } return true; } -- cgit v1.3.1-10-gc9f91