-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 20 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 6 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 1 |
3 files changed, 20 insertions, 7 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 6154d68..2913836 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -36,8 +36,8 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br queryword = word; trenner = QString::null; + lines = 0L; loadValues(); QString opie_dir = getenv("OPIEDIR"); QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); - QStringList lines; if( file.open( IO_ReadOnly ) ) @@ -53,8 +53,16 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br lines = lines.grep( queryword ); + topbrowser = browser_top; + bottombrowser = browser_bottom; +} + +void DingWidget::setText() +{ QString top, bottom; - parseInfo( lines, top , bottom ); - browser_top->setText( top ); - browser_bottom->setText( bottom ); + QStringList test = lines; + parseInfo( test, top , bottom ); + + topbrowser->setText( top ); + bottombrowser->setText( bottom ); } @@ -77,8 +85,6 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) QString html_table_sep = "</td><td>"; QString html_table_right = "</td></tr>"; - QRegExp reg_div( "\\" ); - //QRegExp reg_div( trenner ); + QRegExp reg_div( trenner ); QRegExp reg_word( queryword ); - //QString substitute = "<font color=red>"+queryword+"</font>"; QString substitute = "<a href=''>"+queryword+"</a>"; QStringList toplist, bottomlist; diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index 1cedb4e..c96039f 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h @@ -12,4 +12,6 @@ class QTextBrowser; class QStringList; +#include <qstringlist.h> + #include <qstring.h> @@ -19,4 +21,6 @@ class DingWidget DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); + void setText(); + QStringList lines; private: QString search_word; @@ -26,3 +30,5 @@ class DingWidget QString methodname; QString trenner; + + QTextBrowser *topbrowser, *bottombrowser; }; diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index e0104eb..6f176f9 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -106,4 +106,5 @@ void ODict::slotStartQuery() else DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name ); + ding->setText(); } |