commit for carsten

author: tille <tille> 2003-01-09 13:56:54 (UTC)
committer: tille <tille> 2003-01-09 13:56:54 (UTC)
commit: da7a12b48efb1ff37d1316d77f52123778a403a4 (patch) (unidiff)
tree: 9122c888663a54e78c830410851289ceed0ea676 /noncore
parent: b83656c4faa3556a753b7b8642aef1264e8404f3 (diff)
download: opie-da7a12b48efb1ff37d1316d77f52123778a403a4.zip
opie-da7a12b48efb1ff37d1316d77f52123778a403a4.tar.gz
opie-da7a12b48efb1ff37d1316d77f52123778a403a4.tar.bz2
4 files changed, 159 insertions, 44 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 2913836..7abad22 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -27,71 +27,117 @@
 #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)
+DingWidget::DingWidget( )
 {
-        methodname = activated_name;
+        methodname = QString::null;
-        queryword = word;
+        trenner = "::";//QString::null;
-        trenner = QString::null;
        lines = 0L;
        loadValues();
+        //X qDebug( topbrowser );
+        //X qDebug( top );
+//X 
+        //X topbrowser = "blahbalh";
+        //X 
+        //X qDebug( topbrowser );
+        //X qDebug( top );
+}
+void DingWidget::loadDict( QString name )
+{
+        qDebug( "MUSS ich wirklich aufgerufen werder? schreit loadDict" );
+        qDebug( "Starte mit dem loadedDict(...)" );
+        dictName = name;
+        qDebug( "bin in loadedDict() und lade das Dict:" );
+        qDebug( dictName );
          QString opie_dir = getenv("OPIEDIR");
        QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
+        //FIXME:this should of course be not hardcoded ;)
        
        if(  file.open(  IO_ReadOnly ) )
        {
                QTextStream stream(  &file );
                while ( !stream.eof() )
                {
                        lines.append(  stream.readLine() );
                }
                file.close();
        }
+        qDebug( "loadedDict(...) ist beended" );
+}
-        lines = lines.grep( queryword );
+QString DingWidget::loadedDict()
+{ 
+        qDebug( dictName );
+        qDebug( "^ ^ ^ ^ ^ ^ ^ war der dictName" );
+        return dictName;
+}
-        topbrowser = browser_top;
+void DingWidget::setCaseSensitive( bool caseS )
-        bottombrowser = browser_bottom;
+{
+        isCaseSensitive = caseS;
 }
-void DingWidget::setText()
+void DingWidget::setDict( QString dict )
 {
-        QString top, bottom;
+        methodname = dict;
-        QStringList test = lines;
+}
-        parseInfo( test, top , bottom );
        
-        topbrowser->setText( top );
+void DingWidget::setCompleteWord( bool cword )
-        bottombrowser->setText( bottom );
+{
+        isCompleteWord = cword;
+}
+void DingWidget::setQueryWord( QString qword )
+{
+        queryword = qword;
+}
+BroswerContent DingWidget::setText( QString word )
+{
+        queryword = word;
+        qDebug( queryword );
+        qDebug( "^ ^ ^ ^ ^ ^ ^ war das gesuchte Word");
+        return parseInfo();
 }
 void DingWidget::loadValues()
 {
        Config cfg(  "odict" );
        cfg.setGroup( "Method_"+methodname );
-        trenner = cfg.readEntry( "Seperator" );
+        //trenner = cfg.readEntry( "Seperator" );
 }
-void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
+BroswerContent DingWidget::parseInfo()
 {
+        QStringList search = lines.grep( queryword );
         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( trenner );
        QRegExp reg_word( queryword );
-        QString substitute = "<a href=''>"+queryword+"</a>";
        QStringList toplist, bottomlist;
-        for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
+        QString substitute = "<strong>"+queryword+"</strong>";
+        /*             Dieser Block ist von Patrik. Ich versuche einen neuen
+         *             Ansatz. Zum einen ist HTML schei�e an dieser Stelle und 
+         *             zum andern funktioniert der Code nicht so wie er sollte.
+        QString substitute = "<a href=''>"+queryword+"</a>";
+         
+        for( QStringList::Iterator it = search.begin() ; it != search.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 ) )
                {
@@ -103,9 +149,36 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
                  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;
+        s_strings.bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
-        top    = html_header + toplist.join( "<br>" )    + html_footer;
+        s_strings.top    = html_header + toplist.join( "<br>" )    + html_footer;
+        */
+        for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
+        {
+                current = *it;
+                left = current.left( current.find( trenner ) );
+                
+                right = current.right( current.length() - current.find(trenner) -2 );
+                if ( left.contains( queryword ) )
+                {
+                        left.replace( queryword, substitute );
+                        left = left + "-->" + right;
+                        toplist.append( left );
+                }
+                else
+                {
+                        right.replace( queryword, substitute );
+                        left = right + "-->" + left;
+                        bottomlist.append( right );
+                }
+        }
+        s_strings.bottom = bottomlist.join( "\n" );
+        s_strings.top = toplist.join( "\n" );
+        return s_strings;
 }
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index c96039f..ba37009 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -4,31 +4,44 @@
 * 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>
+struct BroswerContent
+{ 
+        QString top;
+        QString bottom;
+};
 class DingWidget
 {
    public:
-                DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);
+                DingWidget();
-                void setText();
+                BroswerContent setText( QString );
                QStringList lines;
+                void setCaseSensitive( bool );
+                void setCompleteWord( bool );
+                void loadDict( QString );
+                QString loadedDict();
+                void setQueryWord( QString );
+                void setDict( QString );
        private:
+                BroswerContent parseInfo();
+                BroswerContent s_strings;
+                bool isCompleteWord;
+                bool isCaseSensitive;
+                QString dictName;
+                
                QString search_word;
-                void parseInfo( QStringList& , QString&, QString& );
-                QString queryword;
                void loadValues();
+                QString queryword;
                QString methodname;
                QString trenner;
-                
-                QTextBrowser *topbrowser, *bottombrowser;
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 6f176f9..549c40a 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -36,28 +36,31 @@
 #include <qpe/resource.h>
 ODict::ODict() : QMainWindow()
 {
        activated_name = QString::null;
+        
        vbox = new QVBox( this );
        setCaption( tr( "OPIE-Dictionary" ) );
        setupMenus();
        QHBox *hbox = new QHBox( vbox );
        QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
        query_le = new QLineEdit( hbox );
        query_co = new QComboBox( hbox );
        connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
        ok_button = new QPushButton( tr( "&Ok" ), hbox );
        connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
        browser_top = new QTextBrowser( vbox );
        browser_bottom = new QTextBrowser( vbox );
+        ding = new DingWidget();
        loadConfig();
        setCentralWidget( vbox );
 }
 void ODict::loadConfig()
 {
@@ -72,12 +75,13 @@ void ODict::loadConfig()
        query_co->clear();
        for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
        {
                cfg.setGroup( *it );
                query_co->insertItem( cfg.readEntry( "Name" ) );
        }
+        slotMethodChanged(1 );           //FIXME: this line should not contain a integer
 }
 void ODict::saveConfig()
 {
        Config cfg ( "odict" );
@@ -87,28 +91,53 @@ void ODict::saveConfig()
        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" ) );
+        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20030108" ) );
 }
 void ODict::slotStartQuery()
 {
        QString querystring = query_le->text();
-        qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
+        //X qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
-        if (querystring.isEmpty()){
+        //X if (querystring.isEmpty()){
-                qWarning("empty querystring");
+        //X     qWarning("empty querystring");
-                return;
+        //X     return;
+        //X }
+        //X if (!activated_name || activated_name.isEmpty())
+        //X     QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
+        //X else
+        //X {
+                
+                ding->setCaseSensitive( casesens ); 
+                ding->setCompleteWord( completewords ); 
+                ding->setDict( activated_name );
+                
+                qDebug( "            activated_name ist :" );
+                qDebug( activated_name );
+                
+                qDebug( "            loadedDict() ist :" );
+                qDebug( ding->loadedDict() );
+                if ( activated_name != ding->loadedDict() )
+                {
+                        qDebug( "ComboBox ge�ndert" );
+                        ding->loadDict(activated_name);
        }
-        if (!activated_name || activated_name.isEmpty())
+                else qDebug( "ComboBox war GLEICH" );
-                QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
+                
-        else
+                BroswerContent test = ding->setText( querystring );
-                DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );
-                ding->setText();
+                browser_top->setText( test.top );
+                browser_bottom->setText( test.bottom );
+                
+                qDebug( "Text sollte gesetzt sein..." );
+        //X }
 }
 void ODict::slotSetErrorcount( int count )
 {
        errorTol = count;
@@ -149,13 +178,13 @@ void ODict::slotSetParameter( int count )
                else
                        regexp = true;
        }
         else qWarning( "ERROR" );
 }
-void ODict::slotMethodChanged( int methodnumber )
+void ODict::slotMethodChanged( int /*methodnumber*/ )
 {
        activated_name = query_co->currentText();
 }
 void ODict::setupMenus()
 {
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 5096c5e..b20c165 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -18,22 +18,24 @@ class QLineEdit;
 class QAction;
 class QVBoxLayout;
 class QActionGroup;
 class DingWidget;
 class QTextBrowser;
 class QComboBox;
+class DingWidget;
 class ODict : public QMainWindow
 {
        Q_OBJECT
        
    public:
                ODict();
                QVBox *vbox;
                QTextBrowser *browser_top,
                                         *browser_bottom;
+                DingWidget *ding;
        private:
                QPopupMenu *help, *settings, *parameter, *error_tol_menu;
                QMenuBar *menu;
                QHBox *hbox;
                QLineEdit *query_le;
@@ -41,14 +43,12 @@ class ODict : public QMainWindow
                QPushButton *ok_button;
                QVBoxLayout *vbox_layout;
                QAction *setting_a, *setting_b;
-                DingWidget *ding;
-                
                void setupMenus();
                int errorTol;
                bool casesens, completewords, regexp;
                
                void loadConfig();
author	tille <tille>	2003-01-09 13:56:54 (UTC)
committer	tille <tille>	2003-01-09 13:56:54 (UTC)
commit	da7a12b48efb1ff37d1316d77f52123778a403a4 (patch) (unidiff)
tree	9122c888663a54e78c830410851289ceed0ea676 /noncore
parent	b83656c4faa3556a753b7b8642aef1264e8404f3 (diff)
download	opie-da7a12b48efb1ff37d1316d77f52123778a403a4.zip opie-da7a12b48efb1ff37d1316d77f52123778a403a4.tar.gz opie-da7a12b48efb1ff37d1316d77f52123778a403a4.tar.bz2

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 2913836..7abad22 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp
@@ -27,71 +27,117 @@
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
		34	DingWidget::DingWidget( )
34	{	35	{
35	methodname = activated_name;	36	methodname = QString::null;
36	queryword = word;	37	trenner = "::";//QString::null;
37	trenner = QString::null;
38	lines = 0L;	38	lines = 0L;
39	loadValues();	39	loadValues();
		40
		41	//X qDebug( topbrowser );
		42	//X qDebug( top );
		43	//X
		44	//X topbrowser = "blahbalh";
		45	//X
		46	//X qDebug( topbrowser );
		47	//X qDebug( top );
		48	}
		49
		50	void DingWidget::loadDict( QString name )
		51	{
		52	qDebug( "MUSS ich wirklich aufgerufen werder? schreit loadDict" );
		53	qDebug( "Starte mit dem loadedDict(...)" );
		54	dictName = name;
		55	qDebug( "bin in loadedDict() und lade das Dict:" );
		56	qDebug( dictName );
40	QString opie_dir = getenv("OPIEDIR");	57	QString opie_dir = getenv("OPIEDIR");
41	QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );	58	QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
		59	//FIXME:this should of course be not hardcoded ;)
42		60
43	if( file.open( IO_ReadOnly ) )	61	if( file.open( IO_ReadOnly ) )
44	{	62	{
45	QTextStream stream( &file );	63	QTextStream stream( &file );
46	while ( !stream.eof() )	64	while ( !stream.eof() )
47	{	65	{
48	lines.append( stream.readLine() );	66	lines.append( stream.readLine() );
49	}	67	}
50	file.close();	68	file.close();
51	}	69	}
		70	qDebug( "loadedDict(...) ist beended" );
		71	}
52		72
53	lines = lines.grep( queryword );	73	QString DingWidget::loadedDict()
		74	{
		75	qDebug( dictName );
		76	qDebug( "^ ^ ^ ^ ^ ^ ^ war der dictName" );
		77	return dictName;
		78	}
54		79
55	topbrowser = browser_top;	80	void DingWidget::setCaseSensitive( bool caseS )
56	bottombrowser = browser_bottom;	81	{
		82	isCaseSensitive = caseS;
57	}	83	}
58		84
59	void DingWidget::setText()	85	void DingWidget::setDict( QString dict )
60	{	86	{
61	QString top, bottom;	87	methodname = dict;
62	QStringList test = lines;	88	}
63	parseInfo( test, top , bottom );
64		89
65	topbrowser->setText( top );	90	void DingWidget::setCompleteWord( bool cword )
66	bottombrowser->setText( bottom );	91	{
		92	isCompleteWord = cword;
		93	}
		94
		95	void DingWidget::setQueryWord( QString qword )
		96	{
		97	queryword = qword;
		98	}
		99
		100	BroswerContent DingWidget::setText( QString word )
		101	{
		102	queryword = word;
		103	qDebug( queryword );
		104	qDebug( "^ ^ ^ ^ ^ ^ ^ war das gesuchte Word");
		105	return parseInfo();
67	}	106	}
68		107
69	void DingWidget::loadValues()	108	void DingWidget::loadValues()
70	{	109	{
71	Config cfg( "odict" );	110	Config cfg( "odict" );
72	cfg.setGroup( "Method_"+methodname );	111	cfg.setGroup( "Method_"+methodname );
73	trenner = cfg.readEntry( "Seperator" );	112	//trenner = cfg.readEntry( "Seperator" );
74	}	113	}
75		114
76	void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )	115	BroswerContent DingWidget::parseInfo()
77	{	116	{
		117	QStringList search = lines.grep( queryword );
78		118
79	QString current;	119	QString current;
80	QString left;	120	QString left;
81	QString right;	121	QString right;
82	QString html_header = "<html><table>";	122	QString html_header = "<html><table>";
83	QString html_footer = "</table></html>";	123	QString html_footer = "</table></html>";
84	QString html_table_left = "<tr><td width='50'>";	124	QString html_table_left = "<tr><td width='50'>";
85	QString html_table_sep = "</td><td>";	125	QString html_table_sep = "</td><td>";
86	QString html_table_right = "</td></tr>";	126	QString html_table_right = "</td></tr>";
87	QRegExp reg_div( trenner );	127	QRegExp reg_div( trenner );
88	QRegExp reg_word( queryword );	128	QRegExp reg_word( queryword );
89	QString substitute = "<a href=''>"+queryword+"</a>";
90	QStringList toplist, bottomlist;	129	QStringList toplist, bottomlist;
91	for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )	130	QString substitute = "<strong>"+queryword+"</strong>";
		131
		132	/* Dieser Block ist von Patrik. Ich versuche einen neuen
		133	* Ansatz. Zum einen ist HTML schei�e an dieser Stelle und
		134	* zum andern funktioniert der Code nicht so wie er sollte.
		135	QString substitute = "<a href=''>"+queryword+"</a>";
		136
		137	for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
92	{	138	{
93	current = *it;	139	current = *it;
94	left = current.left( current.find(reg_div) );	140	left = current.left( current.find(reg_div) );
95	right = current.right( current.length() - current.find(reg_div) - 1 );	141	right = current.right( current.length() - current.find(reg_div) - 1 );
96	if ( left.contains( reg_word ) )	142	if ( left.contains( reg_word ) )
97	{	143	{
@@ -103,9 +149,36 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
103	right.replace( reg_word, substitute );	149	right.replace( reg_word, substitute );
104	bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );	150	bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );
105	}	151	}
106	}	152	}
107		153
108	//thats it, the lists are rendered. Lets put them in one string	154	//thats it, the lists are rendered. Lets put them in one string
109	bottom = html_header + bottomlist.join( "<br>" ) + html_footer;	155	s_strings.bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
110	top = html_header + toplist.join( "<br>" ) + html_footer;	156	s_strings.top = html_header + toplist.join( "<br>" ) + html_footer;
		157	*/
		158
		159	for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
		160	{
		161	current = *it;
		162	left = current.left( current.find( trenner ) );
		163
		164	right = current.right( current.length() - current.find(trenner) -2 );
		165
		166	if ( left.contains( queryword ) )
		167	{
		168	left.replace( queryword, substitute );
		169	left = left + "-->" + right;
		170	toplist.append( left );
		171	}
		172	else
		173	{
		174	right.replace( queryword, substitute );
		175	left = right + "-->" + left;
		176	bottomlist.append( right );
		177	}
		178	}
		179
		180	s_strings.bottom = bottomlist.join( "\n" );
		181	s_strings.top = toplist.join( "\n" );
		182
		183	return s_strings;
111	}	184	}


diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index c96039f..ba37009 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h
@@ -4,31 +4,44 @@
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;
11	class QTextBrowser;
12	class QStringList;
13
14	#include <qstringlist.h>	10	#include <qstringlist.h>
15
16	#include <qstring.h>	11	#include <qstring.h>
17		12
		13	struct BroswerContent
		14	{
		15	QString top;
		16	QString bottom;
		17	};
		18
18	class DingWidget	19	class DingWidget
19	{	20	{
20	public:	21	public:
21	DingWidget(QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);	22	DingWidget();
22		23
23	void setText();	24	BroswerContent setText( QString );
24	QStringList lines;	25	QStringList lines;
		26	void setCaseSensitive( bool );
		27	void setCompleteWord( bool );
		28	void loadDict( QString );
		29	QString loadedDict();
		30	void setQueryWord( QString );
		31	void setDict( QString );
		32
25	private:	33	private:
		34	BroswerContent parseInfo();
		35
		36	BroswerContent s_strings;
		37	bool isCompleteWord;
		38	bool isCaseSensitive;
		39
		40	QString dictName;
		41
26	QString search_word;	42	QString search_word;
27	void parseInfo( QStringList& , QString&, QString& );
28	QString queryword;
29	void loadValues();	43	void loadValues();
		44	QString queryword;
30	QString methodname;	45	QString methodname;
31	QString trenner;	46	QString trenner;
32
33	QTextBrowser topbrowser, bottombrowser;
34	};	47	};


diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 6f176f9..549c40a 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp
@@ -36,28 +36,31 @@
36		36
37	#include <qpe/resource.h>	37	#include <qpe/resource.h>
38		38
39		39
40	ODict::ODict() : QMainWindow()	40	ODict::ODict() : QMainWindow()
41	{	41	{
42
43	activated_name = QString::null;	42	activated_name = QString::null;
		43
44	vbox = new QVBox( this );	44	vbox = new QVBox( this );
45	setCaption( tr( "OPIE-Dictionary" ) );	45	setCaption( tr( "OPIE-Dictionary" ) );
46	setupMenus();	46	setupMenus();
47		47
		48
48	QHBox *hbox = new QHBox( vbox );	49	QHBox *hbox = new QHBox( vbox );
49	QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();	50	QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
50	query_le = new QLineEdit( hbox );	51	query_le = new QLineEdit( hbox );
51	query_co = new QComboBox( hbox );	52	query_co = new QComboBox( hbox );
52	connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );	53	connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
53	ok_button = new QPushButton( tr( "&Ok" ), hbox );	54	ok_button = new QPushButton( tr( "&Ok" ), hbox );
54	connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );	55	connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
55	browser_top = new QTextBrowser( vbox );	56	browser_top = new QTextBrowser( vbox );
56	browser_bottom = new QTextBrowser( vbox );	57	browser_bottom = new QTextBrowser( vbox );
57		58
		59	ding = new DingWidget();
		60
58	loadConfig();	61	loadConfig();
59	setCentralWidget( vbox );	62	setCentralWidget( vbox );
60	}	63	}
61		64
62	void ODict::loadConfig()	65	void ODict::loadConfig()
63	{	66	{
@@ -72,12 +75,13 @@ void ODict::loadConfig()
72	query_co->clear();	75	query_co->clear();
73	for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )	76	for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
74	{	77	{
75	cfg.setGroup( *it );	78	cfg.setGroup( *it );
76	query_co->insertItem( cfg.readEntry( "Name" ) );	79	query_co->insertItem( cfg.readEntry( "Name" ) );
77	}	80	}
		81	slotMethodChanged(1 ); //FIXME: this line should not contain a integer
78	}	82	}
79		83
80		84
81	void ODict::saveConfig()	85	void ODict::saveConfig()
82	{	86	{
83	Config cfg ( "odict" );	87	Config cfg ( "odict" );
@@ -87,28 +91,53 @@ void ODict::saveConfig()
87	cfg.writeEntry( "regexp" , regexp );	91	cfg.writeEntry( "regexp" , regexp );
88	cfg.writeEntry( "completewords" , completewords );	92	cfg.writeEntry( "completewords" , completewords );
89	}	93	}
90		94
91	void ODict::slotDisplayAbout()	95	void ODict::slotDisplayAbout()
92	{	96	{
93	QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030104" ) );	97	QMessageBox::about( this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten Niehaus \n cniehaus@handhelds.org \n Version 20030108" ) );
94	}	98	}
95		99
96	void ODict::slotStartQuery()	100	void ODict::slotStartQuery()
97	{	101	{
98	QString querystring = query_le->text();	102	QString querystring = query_le->text();
99	qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());	103	//X qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
100	if (querystring.isEmpty()){	104	//X if (querystring.isEmpty()){
101	qWarning("empty querystring");	105	//X qWarning("empty querystring");
102	return;	106	//X return;
		107	//X }
		108	//X if (!activated_name \|\| activated_name.isEmpty())
		109	//X QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
		110	//X else
		111	//X {
		112
		113	ding->setCaseSensitive( casesens );
		114	ding->setCompleteWord( completewords );
		115	ding->setDict( activated_name );
		116
		117	qDebug( " activated_name ist :" );
		118	qDebug( activated_name );
		119
		120	qDebug( " loadedDict() ist :" );
		121	qDebug( ding->loadedDict() );
		122	if ( activated_name != ding->loadedDict() )
		123	{
		124	qDebug( "ComboBox ge�ndert" );
		125	ding->loadDict(activated_name);
103	}	126	}
104	if (!activated_name \|\| activated_name.isEmpty())	127	else qDebug( "ComboBox war GLEICH" );
105	QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );	128
106	else	129	BroswerContent test = ding->setText( querystring );
107	DingWidget *ding = new DingWidget( querystring , browser_top, browser_bottom, activated_name );	130
108	ding->setText();	131	browser_top->setText( test.top );
		132	browser_bottom->setText( test.bottom );
		133
		134	qDebug( "Text sollte gesetzt sein..." );
		135
		136	//X }
		137
109	}	138	}
110		139
111		140
112	void ODict::slotSetErrorcount( int count )	141	void ODict::slotSetErrorcount( int count )
113	{	142	{
114	errorTol = count;	143	errorTol = count;
@@ -149,13 +178,13 @@ void ODict::slotSetParameter( int count )
149	else	178	else
150	regexp = true;	179	regexp = true;
151	}	180	}
152	else qWarning( "ERROR" );	181	else qWarning( "ERROR" );
153	}	182	}
154		183
155	void ODict::slotMethodChanged( int methodnumber )	184	void ODict::slotMethodChanged( int /methodnumber/ )
156	{	185	{
157	activated_name = query_co->currentText();	186	activated_name = query_co->currentText();
158	}	187	}
159		188
160	void ODict::setupMenus()	189	void ODict::setupMenus()
161	{	190	{


diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index 5096c5e..b20c165 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h
@@ -18,22 +18,24 @@ class QLineEdit;
18	class QAction;	18	class QAction;
19	class QVBoxLayout;	19	class QVBoxLayout;
20	class QActionGroup;	20	class QActionGroup;
21	class DingWidget;	21	class DingWidget;
22	class QTextBrowser;	22	class QTextBrowser;
23	class QComboBox;	23	class QComboBox;
		24	class DingWidget;
24		25
25	class ODict : public QMainWindow	26	class ODict : public QMainWindow
26	{	27	{
27	Q_OBJECT	28	Q_OBJECT
28		29
29	public:	30	public:
30	ODict();	31	ODict();
31	QVBox *vbox;	32	QVBox *vbox;
32	QTextBrowser *browser_top,	33	QTextBrowser *browser_top,
33	*browser_bottom;	34	*browser_bottom;
		35	DingWidget *ding;
34		36
35	private:	37	private:
36	QPopupMenu help, settings, parameter, error_tol_menu;	38	QPopupMenu help, settings, parameter, error_tol_menu;
37	QMenuBar *menu;	39	QMenuBar *menu;
38	QHBox *hbox;	40	QHBox *hbox;
39	QLineEdit *query_le;	41	QLineEdit *query_le;
@@ -41,14 +43,12 @@ class ODict : public QMainWindow
41	QPushButton *ok_button;	43	QPushButton *ok_button;
42		44
43	QVBoxLayout *vbox_layout;	45	QVBoxLayout *vbox_layout;
44		46
45	QAction setting_a, setting_b;	47	QAction setting_a, setting_b;
46		48
47	DingWidget *ding;
48
49	void setupMenus();	49	void setupMenus();
50		50
51	int errorTol;	51	int errorTol;
52	bool casesens, completewords, regexp;	52	bool casesens, completewords, regexp;
53		53
54	void loadConfig();	54	void loadConfig();