1 files changed, 13 insertions, 3 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 8f5a7ae..b69a803 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -27,15 +27,18 @@
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qtextbrowser.h>
 #include <stdlib.h> // for getenv
-DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom) : QWidget(parent)
+DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent)
 {
+        methodname = activated_name;
        queryword = word;
+        trenner = QString::null;
+        loadValues();
          QString opie_dir = getenv("OPIEDIR");
        QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
        QStringList lines;
        
        if(  file.open(  IO_ReadOnly ) )
        {
@@ -47,30 +50,37 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
                file.close();
        }
        lines = lines.grep( queryword );
        QString top, bottom;
+        //parseInfo( lines, top , bottom );
-        parseInfo( lines, top , bottom );
        browser_top->setText( top );
        browser_bottom->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_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 )
        {

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 8f5a7ae..b69a803 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp
@@ -27,15 +27,18 @@
27	#include <qtextstream.h>	27	#include <qtextstream.h>
28	#include <qstringlist.h>	28	#include <qstringlist.h>
29	#include <qregexp.h>	29	#include <qregexp.h>
30	#include <qtextbrowser.h>	30	#include <qtextbrowser.h>
31	#include <stdlib.h> // for getenv	31	#include <stdlib.h> // for getenv
32		32
33	DingWidget::DingWidget(QWidget parent, QString word, QTextBrowser browser_top, QTextBrowser *browser_bottom) : QWidget(parent)	33	DingWidget::DingWidget(QWidget parent, QString word, QTextBrowser browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent)
34	{	34	{
		35	methodname = activated_name;
35	queryword = word;	36	queryword = word;
		37	trenner = QString::null;
		38	loadValues();
36	QString opie_dir = getenv("OPIEDIR");	39	QString opie_dir = getenv("OPIEDIR");
37	QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );	40	QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
38	QStringList lines;	41	QStringList lines;
39		42
40	if( file.open( IO_ReadOnly ) )	43	if( file.open( IO_ReadOnly ) )
41	{	44	{
@@ -47,30 +50,37 @@ DingWidget::DingWidget(QWidget parent, QString word, QTextBrowser browser_top,
47	file.close();	50	file.close();
48	}	51	}
49		52
50	lines = lines.grep( queryword );	53	lines = lines.grep( queryword );
51		54
52	QString top, bottom;	55	QString top, bottom;
53		56	//parseInfo( lines, top , bottom );
54	parseInfo( lines, top , bottom );
55	browser_top->setText( top );	57	browser_top->setText( top );
56	browser_bottom->setText( bottom );	58	browser_bottom->setText( bottom );
57	}	59	}
58		60
		61	void DingWidget::loadValues()
		62	{
		63	Config cfg( "odict" );
		64	cfg.setGroup( "Method_"+methodname );
		65	trenner = cfg.readEntry( "Seperator" );
		66	}
		67
59	void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )	68	void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
60	{	69	{
61		70
62	QString current;	71	QString current;
63	QString left;	72	QString left;
64	QString right;	73	QString right;
65	QString html_header = "<html><table>";	74	QString html_header = "<html><table>";
66	QString html_footer = "</table></html>";	75	QString html_footer = "</table></html>";
67	QString html_table_left = "<tr><td width='50'>";	76	QString html_table_left = "<tr><td width='50'>";
68	QString html_table_sep = "</td><td>";	77	QString html_table_sep = "</td><td>";
69	QString html_table_right = "</td></tr>";	78	QString html_table_right = "</td></tr>";
70	QRegExp reg_div( "\\" );	79	QRegExp reg_div( "\\" );
		80	//QRegExp reg_div( trenner );
71	QRegExp reg_word( queryword );	81	QRegExp reg_word( queryword );
72	//QString substitute = "<font color=red>"+queryword+"</font>";	82	//QString substitute = "<font color=red>"+queryword+"</font>";
73	QString substitute = "<a href=''>"+queryword+"</a>";	83	QString substitute = "<a href=''>"+queryword+"</a>";
74	QStringList toplist, bottomlist;	84	QStringList toplist, bottomlist;
75	for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )	85	for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
76	{	86	{