3 files changed, 13 insertions, 23 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 5b5d731..cfef84d 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -36,13 +36,4 @@ DingWidget::DingWidget( )
 	methodname = QString::null;
-	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 );
 }
@@ -70,2 +61,3 @@ void DingWidget::loadDict( QString name )
 	qDebug( "loadedDict(...) ist beended" );
+	loadValues();
 }
@@ -110,4 +102,4 @@ void DingWidget::loadValues()
 	Config cfg(  "odict" );
-	cfg.setGroup( "Method_"+methodname );
-	//trenner = cfg.readEntry( "Seperator" );
+	cfg.setGroup( "Method_" + methodname );
+	trenner = cfg.readEntry( "Seperator" );
 }
@@ -116,2 +108,3 @@ BroswerContent DingWidget::parseInfo()
 {
+	if ( isCompleteWord ) queryword = " " + queryword + " ";
 	QStringList search = lines.grep( queryword , isCaseSensitive );
@@ -121,7 +114,2 @@ BroswerContent DingWidget::parseInfo()
  	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 );
@@ -136,2 +124,8 @@ BroswerContent DingWidget::parseInfo()
 	QString substitute = "<a href=''>"+queryword+"</a>";
+	
+	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>";
 	 
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index ba37009..74f40c9 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -31,2 +31,3 @@ class DingWidget
 		void setDict( QString );
+		void loadValues();
 
@@ -42,3 +43,2 @@ class DingWidget
 		QString search_word;
-		void loadValues();
 		QString queryword;
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 42604ee..78c3f90 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -59,2 +59,3 @@ ODict::ODict() : QMainWindow()
 	ding = new DingWidget();
+	ding->loadValues();
 
@@ -112,5 +113,2 @@ void ODict::slotStartQuery()
 
-		if ( casesens ) qDebug( "casesens = TRUE" );
-		else qDebug( "casesens = FALSE" );
-		
 		ding->setCaseSensitive( casesens ); 
@@ -121,6 +119,4 @@ void ODict::slotStartQuery()
 		{
-			qDebug( "ComboBox geändert" );
 			ding->loadDict(activated_name);
 		}
-		else qDebug( "ComboBox war GLEICH" );