works nowworks now

2 files changed, 11 insertions, 4 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index d923b80..26c0066 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -11,63 +11,69 @@
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 #include "dingwidget.h"
 
 #include <qfile.h>
 #include <qpe/config.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmainwindow.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qtextbrowser.h>
 #include <stdlib.h> // for getenv
 
 DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom) : QWidget(parent)
 {
+	queryword = word;
   	QString opie_dir = getenv("OPIEDIR");
 	QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
 	QStringList lines;
 
 	if(  file.open(  IO_ReadOnly ) )
 	{
 		QTextStream stream(  &file );
 		while ( !stream.eof() )
 		{
 			lines.append(  stream.readLine() );
 		}
 		file.close();
 	}
 
 	lines = lines.grep( word );
 
 	QString top, bottom;
 
 	parseInfo( lines, top , bottom );
 	browser_top->setText( top );
 	browser_bottom->setText( bottom );
 }
 
 void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
 {
-	QRegExp reg( "\\" );
+	QRegExp reg_div( "\\" );
+	QRegExp reg_word( queryword );
+	QString substitute = "<b>"+queryword+"</b>";
 	QStringList toplist, bottomlist;
 	for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
 	{
 		QString current = *it;
-		toplist.append(  current.left( current.find(reg) ) );
-		bottomlist.append(  current.right( current.length() - current.find(reg) - 1 ) );
+        QString temp = current.left( current.find(reg_div) );
+		temp.replace( reg_word, substitute );
+		toplist.append( temp );
+		temp =  current.right( current.length() - current.find(reg_div) - 1 );
+		temp.replace( reg_word, substitute );
+		bottomlist.append( temp );
 	}
 		
-
 	//thats it, the lists are rendered. Lets put them in one string
 	bottom = bottomlist.join( "\n" );
 	top = toplist.join( "\n" );
 }
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index c82e0f0..644162f 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -2,25 +2,26 @@
  *                                                                         *
  * This program is free software; you can redistribute it and/or modify    *
  * it under the terms of the GNU General Public License as published by    *
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 
 #include <qwidget.h>
 
 class QString;
 class QTextBrowser;
 class QString;
 class QStringList;
 
 class DingWidget : public QWidget
 {
 	Q_OBJECT
 	
     public:
 		DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0);
 
 	private:
 		void parseInfo( QStringList& , QString&, QString& );
+		QString queryword;
 };