author | cniehaus <cniehaus> | 2003-05-10 20:58:31 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-10 20:58:31 (UTC) |
commit | cd5ea84b4061c1d3b8401252fd2c36efade02c95 (patch) (side-by-side diff) | |
tree | c97d2f5ed8a1fed0c2aec3aafdf621e996719663 /noncore/apps | |
parent | 1bff948326aa752c3f4aceac4083717f8c2066e8 (diff) | |
download | opie-cd5ea84b4061c1d3b8401252fd2c36efade02c95.zip opie-cd5ea84b4061c1d3b8401252fd2c36efade02c95.tar.gz opie-cd5ea84b4061c1d3b8401252fd2c36efade02c95.tar.bz2 |
fix a stupid bug
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 3 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 6 |
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 @@ -33,9 +33,8 @@ 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" ) ); @@ -48,8 +47,11 @@ void DingWidget::loadDict( QString name ) lines.append( stream.readLine() ); } file.close(); } + + setDict( name ); + loadValues(); } QString DingWidget::loadedDict() const @@ -78,8 +80,9 @@ 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" ); } @@ -106,18 +109,18 @@ BroswerContent DingWidget::parseInfo() 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 @@ -23,9 +23,8 @@ class DingWidget BroswerContent setText( QString ); QStringList lines; void setCaseSensitive( bool ); - void setCompleteWord( bool ); void loadDict( QString ); QString loadedDict() const; void setQueryWord( QString ); void setDict( QString ); @@ -34,13 +33,13 @@ class DingWidget QString lang1_name, lang2_name; bool isCaseSensitive; + private: BroswerContent parseInfo(); BroswerContent s_strings; - bool isCompleteWord; QString dictName; QString search_word; 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 @@ -60,9 +60,8 @@ ODict::ODict() : QMainWindow() bottom_name->setAlignment( AlignHCenter ); browser_bottom = new QTextBrowser( vbox ); ding = new DingWidget(); - ding->loadValues(); loadConfig(); setCentralWidget( vbox ); } @@ -107,8 +106,9 @@ void ODict::loadConfig() */ lookupLanguageNames( lastname ); ding->loadDict( lastname ); + ding->loadValues(); query_co->setCurrentItem( e ); top_name->setText( top_name_content ); bottom_name->setText( bottom_name_content ); @@ -198,12 +198,8 @@ 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); |