Diffstat (limited to 'noncore/apps/odict/dingwidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 20 |
1 files changed, 13 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 | |||
@@ -32,16 +32,16 @@ | |||
32 | 32 | ||
33 | DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) | 33 | DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) |
34 | { | 34 | { |
35 | methodname = activated_name; | 35 | methodname = activated_name; |
36 | queryword = word; | 36 | queryword = word; |
37 | trenner = QString::null; | 37 | trenner = QString::null; |
38 | lines = 0L; | ||
38 | loadValues(); | 39 | loadValues(); |
39 | QString opie_dir = getenv("OPIEDIR"); | 40 | QString opie_dir = getenv("OPIEDIR"); |
40 | QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); | 41 | QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" ); |
41 | QStringList lines; | ||
42 | 42 | ||
43 | if( file.open( IO_ReadOnly ) ) | 43 | if( file.open( IO_ReadOnly ) ) |
44 | { | 44 | { |
45 | QTextStream stream( &file ); | 45 | QTextStream stream( &file ); |
46 | while ( !stream.eof() ) | 46 | while ( !stream.eof() ) |
47 | { | 47 | { |
@@ -49,16 +49,24 @@ DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *br | |||
49 | } | 49 | } |
50 | file.close(); | 50 | file.close(); |
51 | } | 51 | } |
52 | 52 | ||
53 | lines = lines.grep( queryword ); | 53 | lines = lines.grep( queryword ); |
54 | 54 | ||
55 | topbrowser = browser_top; | ||
56 | bottombrowser = browser_bottom; | ||
57 | } | ||
58 | |||
59 | void DingWidget::setText() | ||
60 | { | ||
55 | QString top, bottom; | 61 | QString top, bottom; |
56 | parseInfo( lines, top , bottom ); | 62 | QStringList test = lines; |
57 | browser_top->setText( top ); | 63 | parseInfo( test, top , bottom ); |
58 | browser_bottom->setText( bottom ); | 64 | |
65 | topbrowser->setText( top ); | ||
66 | bottombrowser->setText( bottom ); | ||
59 | } | 67 | } |
60 | 68 | ||
61 | void DingWidget::loadValues() | 69 | void DingWidget::loadValues() |
62 | { | 70 | { |
63 | Config cfg( "odict" ); | 71 | Config cfg( "odict" ); |
64 | cfg.setGroup( "Method_"+methodname ); | 72 | cfg.setGroup( "Method_"+methodname ); |
@@ -73,16 +81,14 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) | |||
73 | QString right; | 81 | QString right; |
74 | QString html_header = "<html><table>"; | 82 | QString html_header = "<html><table>"; |
75 | QString html_footer = "</table></html>"; | 83 | QString html_footer = "</table></html>"; |
76 | QString html_table_left = "<tr><td width='50'>"; | 84 | QString html_table_left = "<tr><td width='50'>"; |
77 | QString html_table_sep = "</td><td>"; | 85 | QString html_table_sep = "</td><td>"; |
78 | QString html_table_right = "</td></tr>"; | 86 | QString html_table_right = "</td></tr>"; |
79 | QRegExp reg_div( "\\" ); | 87 | QRegExp reg_div( trenner ); |
80 | //QRegExp reg_div( trenner ); | ||
81 | QRegExp reg_word( queryword ); | 88 | QRegExp reg_word( queryword ); |
82 | //QString substitute = "<font color=red>"+queryword+"</font>"; | ||
83 | QString substitute = "<a href=''>"+queryword+"</a>"; | 89 | QString substitute = "<a href=''>"+queryword+"</a>"; |
84 | QStringList toplist, bottomlist; | 90 | QStringList toplist, bottomlist; |
85 | for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it ) | 91 | for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it ) |
86 | { | 92 | { |
87 | current = *it; | 93 | current = *it; |
88 | left = current.left( current.find(reg_div) ); | 94 | left = current.left( current.find(reg_div) ); |