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
@@ -31,13 +31,12 @@ DingWidget::DingWidget( )
 }
 
 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" );
 	cfg.setGroup( "Method_" + name );
 	QFile file( cfg.readEntry( "file" )  );
 
 	if(  file.open(  IO_ReadOnly ) )
@@ -46,12 +45,15 @@ void DingWidget::loadDict( QString name )
 		while ( !stream.eof() )
 		{
 			lines.append(  stream.readLine() );
 		}
 		file.close();
 	}
+
+	setDict( name );
+
 	loadValues();
 }
 
 QString DingWidget::loadedDict() const
 { 
 	return dictName;
@@ -76,12 +78,13 @@ void DingWidget::setQueryWord( QString qword )
 void DingWidget::loadValues()
 {
 	if ( !methodname ) return;
 	Config cfg(  "odict" );
 	cfg.setGroup( "Method_" + methodname );
 	trenner = cfg.readEntry( "Seperator" );
+	
 	lang1_name = cfg.readEntry( "Lang1" );
 	lang2_name = cfg.readEntry( "Lang2" );
 }
 
 BroswerContent DingWidget::setText( QString word )
 {
@@ -104,22 +107,22 @@ BroswerContent DingWidget::parseInfo()
 	QString substitute = "<strong>"+queryword+"</strong>";
 
 	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) - trenner.length() );
 
  		if ( left.contains( queryword , isCaseSensitive ) )
 		{
 			left.replace( queryword, substitute );
 			left = left + " --> " + right;
 			toplist.append( left );
 		}
-		else
+		else if( right.contains( queryword , isCaseSensitive ) )
 		{
 			right.replace( queryword, substitute );
 			right = right + " --> " + left;
 			bottomlist.append( right );
 		}
 	}
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
@@ -21,28 +21,27 @@ class DingWidget
     public:
 		DingWidget();
 
 		BroswerContent setText( QString );
 		QStringList lines;
 		void setCaseSensitive( bool );
-		void setCompleteWord( bool );
 		void loadDict( QString );
 		QString loadedDict() const;
 		void setQueryWord( QString );
 		void setDict( QString );
 		void loadValues();
 		
 		QString lang1_name,
 				lang2_name;
 
 		bool isCaseSensitive;
+
 	private:
 		BroswerContent parseInfo();
 
 		BroswerContent s_strings;
-		bool isCompleteWord;
 
 		QString dictName;
 		
 		QString search_word;
 		QString queryword;
 		QString methodname;
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
@@ -58,13 +58,12 @@ ODict::ODict() : QMainWindow()
 	browser_top = new QTextBrowser( vbox );
 	bottom_name = new QLabel( vbox );
 	bottom_name->setAlignment( AlignHCenter );
 	browser_bottom = new QTextBrowser( vbox );
 
 	ding = new DingWidget();
-	ding->loadValues();
 
 	loadConfig();
 	setCentralWidget( vbox );
 }
 
 void ODict::loadConfig()
@@ -105,12 +104,13 @@ void ODict::loadConfig()
 	/*
 	 * now set the two names of the dictionary and the correct QComboBox-Entry
 	 */
 
 	lookupLanguageNames( lastname );
 	ding->loadDict( lastname );
+	ding->loadValues();
 
 	query_co->setCurrentItem( e );
 	top_name->setText( top_name_content );
 	bottom_name->setText( bottom_name_content );
 }
 
@@ -196,16 +196,12 @@ void ODict::slotSetParameter( int count )
 }
 
 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() )
 	{
 		ding->loadDict(activated_name);
 		
 		lookupLanguageNames( activated_name );
 		top_name->setText( top_name_content );