2 files changed, 15 insertions, 52 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index ed67abf..55a716d 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -34,13 +34,10 @@ void DingWidget::loadDict( QString name )
 {
-        qDebug( "bin in DingWidget::loadDict(). name ist:" );
-        qDebug( name );
+        lines.clear(); //as we will load a new list we have to
+                       //remove the old one
+        qDebug( "DingWidget::loadDict( ... )" );
         
-        dictName = name;
         Config cfg(  "odict" );
-        if ( !methodname ) { return; }
-        cfg.setGroup( "Method_" + methodname );
+        cfg.setGroup( "Method_" + name );
         QFile file( cfg.readEntry( "file" )  );
 
-        qDebug( cfg.readEntry( "file" ) );
-        
         if(  file.open(  IO_ReadOnly ) )
@@ -55,3 +52,2 @@ void DingWidget::loadDict( QString name )
         loadValues();
-
 }
@@ -73,7 +69,2 @@ void DingWidget::setDict( QString dict )
 
-void DingWidget::setCompleteWord( bool cword )
-{
-        isCompleteWord = cword;
-}
-
 void DingWidget::setQueryWord( QString qword )
@@ -103,11 +94,7 @@ BroswerContent DingWidget::parseInfo()
 {
-        qDebug( "bin in DingWidget::parseInfo()" );
-
-        if ( isCompleteWord ) 
-                queryword = " " + queryword + " ";
         QStringList search = lines.grep( queryword , isCaseSensitive );
 
-         QString current;
-         QString left;
-         QString right;
+        QString current;
+        QString left;
+        QString right;
         QRegExp reg_div( trenner );
@@ -141,4 +128,5 @@ BroswerContent DingWidget::parseInfo()
         s_strings.bottom = bottomlist.join( "<br>" );
-
+        
         return s_strings;
 }
+
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 0745f53..c1de6ac 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -24,3 +24,2 @@
 #include <qmessagebox.h>
-#include <qpe/config.h>
 #include <qhbox.h>
@@ -37,3 +36,3 @@
 #include <qpe/resource.h>
-
+#include <qpe/config.h>
 
@@ -65,3 +64,3 @@ ODict::ODict() : QMainWindow()
         ding->loadValues();
-        
+
         loadConfig();
@@ -81,3 +80,2 @@ void ODict::loadConfig()
         regexp = cfg.readEntry( "regexp" ).toInt();
-        completewords = cfg.readEntry( "completewords" ).toInt();
 
@@ -111,2 +109,3 @@ void ODict::loadConfig()
         lookupLanguageNames( lastname );
+        ding->loadDict( lastname );
 
@@ -131,3 +130,2 @@ void ODict::saveConfig()
         cfg.writeEntry( "regexp" , regexp );
-        cfg.writeEntry( "completewords" , completewords );
         cfg.writeEntry( "lastdict" , query_co->currentText() );
@@ -137,4 +135,2 @@ void ODict::slotStartQuery()
 {
-        qDebug( "bin in slotStartQuery()" );
-        
         QString querystring = query_le->text();
@@ -151,3 +147,3 @@ void ODict::slotStartQuery()
                                                 tr( "&Cancel" ),
-                                                0,      // Define a dict choosen
+                                                0,      // Define a dict
                                                 1 ) )   // Cancel choosen
@@ -166,11 +162,2 @@ void ODict::slotStartQuery()
                 ding->setCaseSensitive( casesens ); 
-                ding->setCompleteWord( completewords ); 
-
-                qDebug( "activated_name ist:" );
-                qDebug( activated_name );
-                
-                ding->setDict( activated_name );
-
-        //X     if ( activated_name != ding->loadedDict() )
-                        ding->loadDict(activated_name);
 
@@ -178,7 +165,2 @@ void ODict::slotStartQuery()
 
-                qDebug( querystring );
-                if ( ding->isCaseSensitive )
-                        qDebug( "ist CS");
-                else qDebug( "kein CS" );
-
                 browser_top->setText( test.top );
@@ -207,9 +189,2 @@ void ODict::slotSetParameter( int count )
         {
-                if ( completewords )
-                        completewords = false;
-                else
-                        completewords = true;
-        }
-         if ( count == 2 )
-        {
                 if ( regexp )
@@ -228,4 +203,5 @@ void ODict::slotMethodChanged( const QString& methodnumber )
         qDebug( activated_name );
+        qDebug( ding->loadedDict() );
         
-        //X if ( activated_name != ding->loadedDict() )
+        if ( activated_name != ding->loadedDict() )
         {
@@ -252,3 +228,2 @@ void ODict::setupMenus()
         parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 );
-        parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ;
         parameter->insertItem( tr( "Allow &reg. expressions" ), 2 );