author | cniehaus <cniehaus> | 2003-01-04 15:18:12 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-01-04 15:18:12 (UTC) |
commit | 059caec066275d75501471a49c5465fe4def59cf (patch) (side-by-side diff) | |
tree | 08466d10e4c796fc12e86367860ca7dfd5f829a1 /noncore | |
parent | 4a9e13d7b9220b45cbbbdfab5f2ea56ea415d6a7 (diff) | |
download | opie-059caec066275d75501471a49c5465fe4def59cf.zip opie-059caec066275d75501471a49c5465fe4def59cf.tar.gz opie-059caec066275d75501471a49c5465fe4def59cf.tar.bz2 |
ok, now we have no more memleaks (I valgrind'ed and gdb'ed) and some more
feature are working.
-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 @@ -26,69 +26,75 @@ #include <qstring.h> #include <qtextstream.h> #include <qstringlist.h> #include <qregexp.h> #include <qtextbrowser.h> #include <stdlib.h> // for getenv DingWidget::DingWidget(QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) { methodname = activated_name; 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 ) ) { QTextStream stream( &file ); while ( !stream.eof() ) { lines.append( stream.readLine() ); } file.close(); } 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 ); } void DingWidget::loadValues() { Config cfg( "odict" ); cfg.setGroup( "Method_"+methodname ); trenner = cfg.readEntry( "Seperator" ); } void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom ) { QString current; QString left; QString right; QString html_header = "<html><table>"; QString html_footer = "</table></html>"; QString html_table_left = "<tr><td width='50'>"; 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; for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it ) { 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( html_table_left + left + html_table_sep + right + html_table_right ); } 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 @@ -2,27 +2,33 @@ * * * 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. * * * **************************************************************************/ class QString; class QTextBrowser; class QStringList; +#include <qstringlist.h> + #include <qstring.h> class DingWidget { public: DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0); + void setText(); + QStringList lines; private: QString search_word; void parseInfo( QStringList& , QString&, QString& ); QString queryword; void loadValues(); 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 @@ -96,24 +96,25 @@ void ODict::slotDisplayAbout() void ODict::slotStartQuery() { QString querystring = query_le->text(); qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1()); if (querystring.isEmpty()){ qWarning("empty querystring"); return; } if (!activated_name || activated_name.isEmpty()) QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") ); else DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name ); + ding->setText(); } void ODict::slotSetErrorcount( int count ) { errorTol = count; } void ODict::slotSettings() { ConfigDlg dlg( this, "Config" , true); if ( dlg.exec() == QDialog::Accepted ) |