porting help module (wip)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1539 17fca916-40b9-46aa-a4ea-0a15b648b75c

4 files changed, 38 insertions, 71 deletions

diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index e0068b715..64beb989e 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -32,11 +32,11 @@
 #include "helpwindow.h"
 #include "kvi_fileutils.h"
 
-#include <qtoolbutton.h>
-#include <qlineedit.h>
-#include <qtooltip.h>
-#include <qtimer.h>
-#include <qclipboard.h>
+#include <QToolButton>
+#include <QLineEdit>
+#include <QToolTip>
+#include <QTimer>
+#include <QClipboard>
 
 extern Index        * g_pDocIndex;
 extern KviPointerList<KviHelpWindow> * g_pHelpWindowList;
@@ -49,12 +49,9 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	if(bIsStandalone)g_pHelpWidgetList->append(this);
 	m_bIsStandalone = bIsStandalone;
 
-//#warning "Re enable this when using Qt 3.0 : QProcess "
 	m_pTextBrowser = new QTextBrowser(this,"text_browser");
 	m_pTextBrowser->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken);
-#ifndef COMPILE_USE_QT4
-	m_pTextBrowser->setFocusPolicy(QWidget::NoFocus);
-#endif
+	m_pTextBrowser->setFocusPolicy(Qt::NoFocus);
 	m_pToolBar = new KviTalHBox(this);
 
 	m_pBtnIndex = new KviStyledToolButton(m_pToolBar);
@@ -99,11 +96,7 @@ KviHelpWidget::~KviHelpWidget()
 
 void KviHelpWidget::showIndex()
 {
-#ifdef COMPILE_USE_QT4
 	m_pTextBrowser->setSource(QUrl("index.html"));
-#else
-	m_pTextBrowser->setSource("index.html");
-#endif
 }
 
 void KviHelpWidget::resizeEvent(QResizeEvent *e)
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 13dcd62e3..4dc1bf257 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -32,12 +32,12 @@
 #include "kvi_config.h"
 #include "kvi_styled_controls.h"
 
-#include <qfileinfo.h>
-#include <qsplitter.h>
-#include <qlineedit.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-#include <qtooltip.h>
+#include <QFileInfo>
+#include <QSplitter>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QRegExp>
+#include <QToolTip>
 #include "kvi_valuelist.h"
 
 #include "kvi_sourcesdate.h"
@@ -61,12 +61,8 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 		if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) {
 			g_pDocIndex->readDict();
 		} else {
-#ifdef COMPILE_USE_QT4
 			QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 );
-#else
-			QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 );
-#endif
-			connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setProgress(int)) );
+			connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setValue(int)) );
 			g_pDocIndex->makeIndex();
 			g_pDocIndex->writeDict();
 			g_pDocIndex->writeDocumentList();
@@ -148,12 +144,8 @@ void KviHelpWindow::loadProperties(KviConfig *cfg)
 void KviHelpWindow::refreshIndex()
 {
 	m_pIndexListBox->clear();
-#ifdef COMPILE_USE_QT4
 	QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 );
-#else
-	QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 );
-#endif
-	connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setProgress(int)) );
+	connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setValue(int)) );
 	g_pDocIndex->makeIndex();
 	g_pDocIndex->writeDict();
 	g_pDocIndex->writeDocumentList();
@@ -183,11 +175,7 @@ void KviHelpWindow::startSearch()
 	(*it) = (*it).replace( "\"", "" );
     }
     if ( str.contains( '\"' ) ) {
-#ifdef COMPILE_USE_QT4
 	if ( (str.count( '\"' ))%2 == 0 ) {
-#else
-	if ( (str.contains( '\"' ))%2 == 0 ) {
-#endif
 	    int beg = 0;
 	    int end = 0;
 	    QString s;
@@ -213,11 +201,7 @@ void KviHelpWindow::startSearch()
 	    return;
 	}
     }
-#ifdef COMPILE_USE_QT4
     setCursor( Qt::WaitCursor );
-#else
-    setCursor( waitCursor );
-#endif
     m_foundDocs.clear();
     m_foundDocs = g_pDocIndex->query( m_terms, termSeq, seqWords );
  
@@ -246,11 +230,7 @@ void KviHelpWindow::startSearch()
     if ( !s.isEmpty() )
 	m_terms << s;
 
-#ifdef COMPILE_USE_QT4
     setCursor( Qt::ArrowCursor );
-#else
-    setCursor( arrowCursor );
-#endif
 }
 
 QTextBrowser * KviHelpWindow::textBrowser()
@@ -262,7 +242,7 @@ void KviHelpWindow::showIndexTopic()
 {
 	if (m_pIndexSearch->text().isEmpty()|| !m_pIndexListBox->selectedItem()) return;
 	int i=g_pDocIndex->titlesList().findIndex(m_pIndexListBox->selectedItem()->text());
-	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
+	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
 void KviHelpWindow::searchInIndex( const QString &s )
@@ -284,13 +264,13 @@ void KviHelpWindow::searchInIndex( const QString &s )
 void KviHelpWindow::indexSelected ( int index )
 {
 	int i=g_pDocIndex->titlesList().findIndex(m_pIndexListBox->text(index));
-	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
+	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
 void KviHelpWindow::searchSelected ( int index )
 {
 	int i=g_pDocIndex->titlesList().findIndex(m_pResultBox->text(index));
-	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
+	textBrowser()->setSource(QUrl(g_pDocIndex->documentList()[ i ]));
 }
 
 QPixmap * KviHelpWindow::myIconPtr()
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 6a5440292..353758145 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -1,13 +1,13 @@
 #include "index.h"
 
 #include "kvi_file.h"
-#include <qdir.h>
-#include <qstringlist.h>
 #include "kvi_pointerhashtable.h"
-#include <qapplication.h>
-#include <qtextstream.h>
 #include <ctype.h>
 
+#include <QDir>
+#include <QStringList>
+#include <QApplication>
+#include <QTextStream>
 
 int kvi_compare(const Term * p1,const Term * p2)
 {
@@ -486,11 +486,7 @@ QStringList Index::getWildcardTerms( const QString &term )
 
     QStringList terms = split( term );
 
-#ifdef COMPILE_USE_QT4
-	QStringList::Iterator iter;
-#else
-    KviValueList<QString>::iterator iter;
-#endif
+    QStringList::Iterator iter;
 
 
     KviPointerHashTableIterator<QString,Entry> it( dict );
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 <q3mimefactory.h>
-#endif
-
+#include <QFileInfo>
+#include <QSplitter>
 
-#include <qsplitter.h>
 Index        * g_pDocIndex = 0;
 KviPointerList<KviHelpWidget> * g_pHelpWidgetList = 0;
 KviPointerList<KviHelpWindow> * 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;
 }