3 files changed, 24 insertions, 11 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
@@ -14,92 +14,98 @@
 * ( at your option ) any later version.                                   *
 *                                                                         *
 **************************************************************************/
 #include "dingwidget.h"
 #include <qfile.h>
 #include <qpe/config.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmainwindow.h>
 #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 );
+        QStringList test = lines;
-        browser_top->setText( top );
+        parseInfo( test, top , bottom );
-        browser_bottom->setText( 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 );
                }
                else
                {
                  right.replace( reg_word, substitute );
                  bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );
                }
        }
                
        //thats it, the lists are rendered. Lets put them in one string
        bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
        top    = html_header + toplist.join( "<br>" )    + html_footer;
 }
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
@@ -1,28 +1,34 @@
 /***************************************************************************
 *                                                                         *
 * 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
@@ -77,55 +77,56 @@ void ODict::loadConfig()
        }
 }
 void ODict::saveConfig()
 {
        Config cfg ( "odict" );
        cfg.setGroup( "generalsettings" );
        cfg.writeEntry( "errtol" , errorTol );
        cfg.writeEntry( "casesens" , casesens );
        cfg.writeEntry( "regexp" , regexp );
        cfg.writeEntry( "completewords" , completewords );
 }
 void ODict::slotDisplayAbout()
 {
        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20030104" ) );
 }
 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");
+                qWarning("empty querystring");
-          return;
+                return;
        }
        if (!activated_name || activated_name.isEmpty())
-          QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
+                QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
        else
-          DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
+                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 )
        {
                dlg.writeEntries();
                loadConfig();
        }
        else qDebug( "abgebrochen" );
 }
 void ODict::slotSetParameter( int count )
 {
         if ( count == 0 )
        {
                if ( casesens )

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
@@ -14,92 +14,98 @@
14	* ( at your option ) any later version. *	14	* ( at your option ) any later version. *
15	* *	15	* *
16	**************************************************************************/	16	**************************************************************************/
17	#include "dingwidget.h"	17	#include "dingwidget.h"
18		18
19	#include <qfile.h>	19	#include <qfile.h>
20	#include <qpe/config.h>	20	#include <qpe/config.h>
21	#include <qhbox.h>	21	#include <qhbox.h>
22	#include <qlabel.h>	22	#include <qlabel.h>
23	#include <qpushbutton.h>	23	#include <qpushbutton.h>
24	#include <qlineedit.h>	24	#include <qlineedit.h>
25	#include <qmainwindow.h>	25	#include <qmainwindow.h>
26	#include <qstring.h>	26	#include <qstring.h>
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(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	{
48	lines.append( stream.readLine() );	48	lines.append( stream.readLine() );
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 );
65	trenner = cfg.readEntry( "Seperator" );	73	trenner = cfg.readEntry( "Seperator" );
66	}	74	}
67		75
68	void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )	76	void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
69	{	77	{
70		78
71	QString current;	79	QString current;
72	QString left;	80	QString left;
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) );
89	right = current.right( current.length() - current.find(reg_div) - 1 );	95	right = current.right( current.length() - current.find(reg_div) - 1 );
90	if ( left.contains( reg_word ) )	96	if ( left.contains( reg_word ) )
91	{	97	{
92	left.replace( queryword, substitute );	98	left.replace( queryword, substitute );
93	toplist.append( html_table_left + left + html_table_sep + right + html_table_right );	99	toplist.append( html_table_left + left + html_table_sep + right + html_table_right );
94	}	100	}
95	else	101	else
96	{	102	{
97	right.replace( reg_word, substitute );	103	right.replace( reg_word, substitute );
98	bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );	104	bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );
99	}	105	}
100	}	106	}
101		107
102	//thats it, the lists are rendered. Lets put them in one string	108	//thats it, the lists are rendered. Lets put them in one string
103	bottom = html_header + bottomlist.join( "<br>" ) + html_footer;	109	bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
104	top = html_header + toplist.join( "<br>" ) + html_footer;	110	top = html_header + toplist.join( "<br>" ) + html_footer;
105	}	111	}


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
@@ -1,28 +1,34 @@
1	/***************************************************************************	1	/***************************************************************************
2	* *	2	* *
3	* This program is free software; you can redistribute it and/or modify *	3	* This program is free software; you can redistribute it and/or modify *
4	* it under the terms of the GNU General Public License as published by *	4	* it under the terms of the GNU General Public License as published by *
5	* the Free Software Foundation; either version 2 of the License, or *	5	* the Free Software Foundation; either version 2 of the License, or *
6	* ( at your option ) any later version. *	6	* ( at your option ) any later version. *
7	* *	7	* *
8	**************************************************************************/	8	**************************************************************************/
9		9
10	class QString;	10	class QString;
11	class QTextBrowser;	11	class QTextBrowser;
12	class QStringList;	12	class QStringList;
13		13
		14	#include <qstringlist.h>
		15
14	#include <qstring.h>	16	#include <qstring.h>
15		17
16	class DingWidget	18	class DingWidget
17	{	19	{
18	public:	20	public:
19	DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);	21	DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);
20		22
		23	void setText();
		24	QStringList lines;
21	private:	25	private:
22	QString search_word;	26	QString search_word;
23	void parseInfo( QStringList& , QString&, QString& );	27	void parseInfo( QStringList& , QString&, QString& );
24	QString queryword;	28	QString queryword;
25	void loadValues();	29	void loadValues();
26	QString methodname;	30	QString methodname;
27	QString trenner;	31	QString trenner;
		32
		33	QTextBrowser topbrowser, bottombrowser;
28	};	34	};


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
@@ -77,55 +77,56 @@ void ODict::loadConfig()
77	}	77	}
78	}	78	}
79		79
80		80
81	void ODict::saveConfig()	81	void ODict::saveConfig()
82	{	82	{
83	Config cfg ( "odict" );	83	Config cfg ( "odict" );
84	cfg.setGroup( "generalsettings" );	84	cfg.setGroup( "generalsettings" );
85	cfg.writeEntry( "errtol" , errorTol );	85	cfg.writeEntry( "errtol" , errorTol );
86	cfg.writeEntry( "casesens" , casesens );	86	cfg.writeEntry( "casesens" , casesens );
87	cfg.writeEntry( "regexp" , regexp );	87	cfg.writeEntry( "regexp" , regexp );
88	cfg.writeEntry( "completewords" , completewords );	88	cfg.writeEntry( "completewords" , completewords );
89	}	89	}
90		90
91	void ODict::slotDisplayAbout()	91	void ODict::slotDisplayAbout()
92	{	92	{
93	QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030104" ) );	93	QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030104" ) );
94	}	94	}
95		95
96	void ODict::slotStartQuery()	96	void ODict::slotStartQuery()
97	{	97	{
98	QString querystring = query_le->text();	98	QString querystring = query_le->text();
99	qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());	99	qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
100	if (querystring.isEmpty()){	100	if (querystring.isEmpty()){
101	qWarning("empty querystring");	101	qWarning("empty querystring");
102	return;	102	return;
103	}	103	}
104	if (!activated_name \|\| activated_name.isEmpty())	104	if (!activated_name \|\| activated_name.isEmpty())
105	QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );	105	QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
106	else	106	else
107	DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );	107	DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
		108	ding->setText();
108	}	109	}
109		110
110		111
111	void ODict::slotSetErrorcount( int count )	112	void ODict::slotSetErrorcount( int count )
112	{	113	{
113	errorTol = count;	114	errorTol = count;
114	}	115	}
115		116
116	void ODict::slotSettings()	117	void ODict::slotSettings()
117	{	118	{
118	ConfigDlg dlg( this, "Config" , true);	119	ConfigDlg dlg( this, "Config" , true);
119	if ( dlg.exec() == QDialog::Accepted )	120	if ( dlg.exec() == QDialog::Accepted )
120	{	121	{
121	dlg.writeEntries();	122	dlg.writeEntries();
122	loadConfig();	123	loadConfig();
123	}	124	}
124	else qDebug( "abgebrochen" );	125	else qDebug( "abgebrochen" );
125	}	126	}
126		127
127	void ODict::slotSetParameter( int count )	128	void ODict::slotSetParameter( int count )
128	{	129	{
129	if ( count == 0 )	130	if ( count == 0 )
130	{	131	{
131	if ( casesens )	132	if ( casesens )