3 files changed, 8 insertions, 10 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 55a716d..c804385 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -35,5 +35,4 @@ void DingWidget::loadDict( QString name )
 	lines.clear(); //as we will load a new list we have to
 	               //remove the old one
-	qDebug( "DingWidget::loadDict( ... )" );
 	
 	Config cfg(  "odict" );
@@ -50,4 +49,7 @@ void DingWidget::loadDict( QString name )
 		file.close();
 	}
+
+	setDict( name );
+
 	loadValues();
 }
@@ -80,4 +82,5 @@ void DingWidget::loadValues()
 	cfg.setGroup( "Method_" + methodname );
 	trenner = cfg.readEntry( "Seperator" );
+	
 	lang1_name = cfg.readEntry( "Lang1" );
 	lang2_name = cfg.readEntry( "Lang2" );
@@ -108,5 +111,5 @@ BroswerContent DingWidget::parseInfo()
 		current = *it;
 		left = current.left( current.find( trenner ) );
- 		
+	
 		right = current.right( current.length() - current.find(trenner) - trenner.length() );
 
@@ -117,5 +120,5 @@ BroswerContent DingWidget::parseInfo()
 			toplist.append( left );
 		}
-		else
+		else if( right.contains( queryword , isCaseSensitive ) )
 		{
 			right.replace( queryword, substitute );
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index dbb55e2..9163a43 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -25,5 +25,4 @@ class DingWidget
 		QStringList lines;
 		void setCaseSensitive( bool );
-		void setCompleteWord( bool );
 		void loadDict( QString );
 		QString loadedDict() const;
@@ -36,9 +35,9 @@ class DingWidget
 
 		bool isCaseSensitive;
+
 	private:
 		BroswerContent parseInfo();
 
 		BroswerContent s_strings;
-		bool isCompleteWord;
 
 		QString dictName;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index c1de6ac..2028701 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -62,5 +62,4 @@ ODict::ODict() : QMainWindow()
 
 	ding = new DingWidget();
-	ding->loadValues();
 
 	loadConfig();
@@ -109,4 +108,5 @@ void ODict::loadConfig()
 	lookupLanguageNames( lastname );
 	ding->loadDict( lastname );
+	ding->loadValues();
 
 	query_co->setCurrentItem( e );
@@ -200,8 +200,4 @@ void ODict::slotMethodChanged( const QString& methodnumber )
 	activated_name =  methodnumber;
 	
-	qDebug( "activated_name in slotMethodChanged() ist:" );
-	qDebug( activated_name );
-	qDebug( ding->loadedDict() );
-	
 	if ( activated_name != ding->loadedDict() )
 	{