1 files changed, 6 insertions, 3 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
@@ -25,39 +25,41 @@
 
 DingWidget::DingWidget( )
 {
         methodname = QString::null;
         trenner = QString::null;
         lines = 0L;
 }
 
 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 ) )
         {
                 QTextStream stream(  &file );
                 while ( !stream.eof() )
                 {
                         lines.append(  stream.readLine() );
                 }
                 file.close();
         }
+
+        setDict( name );
+
         loadValues();
 }
 
 QString DingWidget::loadedDict() const
 { 
         return dictName;
 }
 
 void DingWidget::setCaseSensitive( bool caseS )
 {
         isCaseSensitive = caseS;
 }
@@ -70,24 +72,25 @@ void DingWidget::setDict( QString dict )
 void DingWidget::setQueryWord( QString qword )
 {
         queryword = 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 )
 {
         queryword = word;
         return parseInfo();
 }
 
 
 BroswerContent DingWidget::parseInfo()
@@ -98,34 +101,34 @@ BroswerContent DingWidget::parseInfo()
         QString left;
         QString right;
         QRegExp reg_div( trenner );
         QRegExp reg_word( queryword );
         reg_word.setCaseSensitive( isCaseSensitive );
         QStringList toplist, bottomlist;
         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 );
                 }
         }
 
         s_strings.top = toplist.join( "<br>" );
         s_strings.bottom = bottomlist.join( "<br>" );
         
         return s_strings;
 }