| -rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 32 | ||||
| -rw-r--r-- | noncore/apps/odict/dingwidget.h | 1 |
2 files changed, 21 insertions, 12 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 26c0066..de02dcc 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -1,79 +1,87 @@ /*************************************************************************** application: : ODict begin : December 2002 copyright : ( C ) 2002, 2003 by Carsten Niehaus email : cniehaus@handhelds.org **************************************************************************/ /*************************************************************************** * * * 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 ); + lines = lines.grep( queryword ); QString top, bottom; parseInfo( lines, top , bottom ); browser_top->setText( top ); browser_bottom->setText( bottom ); } void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) { + + QString current; + QString left; + QString right; QRegExp reg_div( "\\" ); QRegExp reg_word( queryword ); - QString substitute = "<b>"+queryword+"</b>"; + QString substitute = "<font color='#FF0000'>"+queryword+"</font>"; QStringList toplist, bottomlist; for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it ) { - QString current = *it; - 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 ); + current = *it; + left = current.left( current.find(reg_div) ); + right = current.right( current.length() - current.find(reg_div) - 1 ); + if ( left.contains( reg_word ) ){ + left.replace( queryword, substitute ); + toplist.append( left + " -> " + right); + }else{ + right.replace( reg_word, substitute ); + bottomlist.append( right + " -> " + left ); + } + // .replace( reg_word, substitute ); } //thats it, the lists are rendered. Lets put them in one string - bottom = bottomlist.join( "\n" ); - top = toplist.join( "\n" ); + bottom = bottomlist.join( "<br>\n" ); + top = toplist.join( "<br>\n" ); } diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index 644162f..cba1edf 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h @@ -1,27 +1,28 @@ /*************************************************************************** * * * 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: + QString search_word; void parseInfo( QStringList& , QString&, QString& ); QString queryword; }; |