author | tille <tille> | 2003-01-03 21:54:28 (UTC) |
---|---|---|
committer | tille <tille> | 2003-01-03 21:54:28 (UTC) |
commit | bd02568a9a02f27b40c62ae8f56f4ce76bcb62da (patch) (unidiff) | |
tree | 6385ee2ee68331f4fd06dc2ae030552a1e4f59d1 /noncore/apps/odict | |
parent | 7fcee1764fb08804a68574c68427da567966402e (diff) | |
download | opie-bd02568a9a02f27b40c62ae8f56f4ce76bcb62da.zip opie-bd02568a9a02f27b40c62ae8f56f4ce76bcb62da.tar.gz opie-bd02568a9a02f27b40c62ae8f56f4ce76bcb62da.tar.bz2 |
markup does not yet work
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 30 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 1 |
2 files changed, 20 insertions, 11 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 | |||
@@ -47,7 +47,7 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, | |||
47 | file.close(); | 47 | file.close(); |
48 | } | 48 | } |
49 | 49 | ||
50 | lines = lines.grep( word ); | 50 | lines = lines.grep( queryword ); |
51 | 51 | ||
52 | QString top, bottom; | 52 | QString top, bottom; |
53 | 53 | ||
@@ -58,22 +58,30 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, | |||
58 | 58 | ||
59 | void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) | 59 | void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) |
60 | { | 60 | { |
61 | |||
62 | QString current; | ||
63 | QString left; | ||
64 | QString right; | ||
61 | QRegExp reg_div( "\\" ); | 65 | QRegExp reg_div( "\\" ); |
62 | QRegExp reg_word( queryword ); | 66 | QRegExp reg_word( queryword ); |
63 | QString substitute = "<b>"+queryword+"</b>"; | 67 | QString substitute = "<font color='#FF0000'>"+queryword+"</font>"; |
64 | QStringList toplist, bottomlist; | 68 | QStringList toplist, bottomlist; |
65 | for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it ) | 69 | for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it ) |
66 | { | 70 | { |
67 | QString current = *it; | 71 | current = *it; |
68 | QString temp = current.left( current.find(reg_div) ); | 72 | left = current.left( current.find(reg_div) ); |
69 | temp.replace( reg_word, substitute ); | 73 | right = current.right( current.length() - current.find(reg_div) - 1 ); |
70 | toplist.append( temp ); | 74 | if ( left.contains( reg_word ) ){ |
71 | temp = current.right( current.length() - current.find(reg_div) - 1 ); | 75 | left.replace( queryword, substitute ); |
72 | temp.replace( reg_word, substitute ); | 76 | toplist.append( left + " -> " + right); |
73 | bottomlist.append( temp ); | 77 | }else{ |
78 | right.replace( reg_word, substitute ); | ||
79 | bottomlist.append( right + " -> " + left ); | ||
80 | } | ||
81 | // .replace( reg_word, substitute ); | ||
74 | } | 82 | } |
75 | 83 | ||
76 | //thats it, the lists are rendered. Lets put them in one string | 84 | //thats it, the lists are rendered. Lets put them in one string |
77 | bottom = bottomlist.join( "\n" ); | 85 | bottom = bottomlist.join( "<br>\n" ); |
78 | top = toplist.join( "\n" ); | 86 | top = toplist.join( "<br>\n" ); |
79 | } | 87 | } |
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 | |||
@@ -22,6 +22,7 @@ class DingWidget : public QWidget | |||
22 | DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0); | 22 | DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0); |
23 | 23 | ||
24 | private: | 24 | private: |
25 | QString search_word; | ||
25 | void parseInfo( QStringList& , QString&, QString& ); | 26 | void parseInfo( QStringList& , QString&, QString& ); |
26 | QString queryword; | 27 | QString queryword; |
27 | }; | 28 | }; |