summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/dingwidget.cpp14
-rw-r--r--noncore/apps/odict/dingwidget.h1
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
@@ -23,24 +23,25 @@
#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();
@@ -48,26 +49,31 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
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
@@ -14,13 +14,14 @@ 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;
};