fix a stupid bug

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
@@ -29,31 +29,33 @@ DingWidget::DingWidget( )
         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;
 }
 
@@ -74,16 +76,17 @@ 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 )
 {
         queryword = word;
         return parseInfo();
@@ -102,26 +105,26 @@ BroswerContent DingWidget::parseInfo()
         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>" );
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
@@ -19,32 +19,31 @@ struct BroswerContent
 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;
                 QString trenner;
 };
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
@@ -56,17 +56,16 @@ ODict::ODict() : QMainWindow()
         top_name = new QLabel( vbox );
         top_name->setAlignment( AlignHCenter );
         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()
 {
         /*
@@ -103,16 +102,17 @@ void ODict::loadConfig()
                 i++;
         }
         /*
          * 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 );
 }
 
 void ODict::lookupLanguageNames( QString dictname )
 {
@@ -194,20 +194,16 @@ void ODict::slotSetParameter( int count )
         }
         saveConfig();
 }
 
 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 );
                 bottom_name->setText( bottom_name_content );
         }