| -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 @@ -38,3 +38,3 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QStringList lines; - + if( file.open( IO_ReadOnly ) ) @@ -49,3 +49,3 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, - lines = lines.grep( word ); + lines = lines.grep( queryword ); @@ -60,5 +60,9 @@ 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; @@ -66,9 +70,13 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) { - 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 ); } @@ -76,4 +84,4 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) //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 @@ -24,2 +24,3 @@ class DingWidget : public QWidget private: + QString search_word; void parseInfo( QStringList& , QString&, QString& ); |