| -rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 30 | ||||
| -rw-r--r-- | noncore/apps/odict/odict.cpp | 37 |
2 files changed, 15 insertions, 52 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index ed67abf..55a716d 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -31,19 +31,16 @@ DingWidget::DingWidget( ) } void DingWidget::loadDict( QString name ) { - qDebug( "bin in DingWidget::loadDict(). name ist:" ); - qDebug( name ); + lines.clear(); //as we will load a new list we have to + //remove the old one + qDebug( "DingWidget::loadDict( ... )" ); - dictName = name; Config cfg( "odict" ); - if ( !methodname ) { return; } - cfg.setGroup( "Method_" + methodname ); + cfg.setGroup( "Method_" + name ); QFile file( cfg.readEntry( "file" ) ); - qDebug( cfg.readEntry( "file" ) ); - if( file.open( IO_ReadOnly ) ) { QTextStream stream( &file ); while ( !stream.eof() ) @@ -52,9 +49,8 @@ void DingWidget::loadDict( QString name ) } file.close(); } loadValues(); - } QString DingWidget::loadedDict() const { @@ -70,13 +66,8 @@ void DingWidget::setDict( QString dict ) { methodname = dict; } -void DingWidget::setCompleteWord( bool cword ) -{ - isCompleteWord = cword; -} - void DingWidget::setQueryWord( QString qword ) { queryword = qword; } @@ -100,17 +91,13 @@ BroswerContent DingWidget::setText( QString word ) BroswerContent DingWidget::parseInfo() { - qDebug( "bin in DingWidget::parseInfo()" ); - - if ( isCompleteWord ) - queryword = " " + queryword + " "; QStringList search = lines.grep( queryword , isCaseSensitive ); - QString current; - QString left; - QString right; + QString current; + QString left; + QString right; QRegExp reg_div( trenner ); QRegExp reg_word( queryword ); reg_word.setCaseSensitive( isCaseSensitive ); QStringList toplist, bottomlist; @@ -138,7 +125,8 @@ BroswerContent DingWidget::parseInfo() } s_strings.top = toplist.join( "<br>" ); s_strings.bottom = bottomlist.join( "<br>" ); - + return s_strings; } + diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 0745f53..c1de6ac 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -21,9 +21,8 @@ #include <qlayout.h> #include <qpopupmenu.h> #include <qmenubar.h> #include <qmessagebox.h> -#include <qpe/config.h> #include <qhbox.h> #include <qvbox.h> #include <qlabel.h> #include <qpushbutton.h> @@ -34,9 +33,9 @@ #include <qtextbrowser.h> #include <qcombobox.h> #include <qpe/resource.h> - +#include <qpe/config.h> ODict::ODict() : QMainWindow() { activated_name = QString::null; @@ -62,9 +61,9 @@ ODict::ODict() : QMainWindow() browser_bottom = new QTextBrowser( vbox ); ding = new DingWidget(); ding->loadValues(); - + loadConfig(); setCentralWidget( vbox ); } @@ -78,9 +77,8 @@ void ODict::loadConfig() Config cfg ( "odict" ); cfg.setGroup( "generalsettings" ); casesens = cfg.readEntry( "casesens" ).toInt(); regexp = cfg.readEntry( "regexp" ).toInt(); - completewords = cfg.readEntry( "completewords" ).toInt(); QString lastDict = cfg.readEntry( "lastdict" ); int i = 0, e = 0; @@ -108,8 +106,9 @@ void ODict::loadConfig() * now set the two names of the dictionary and the correct QComboBox-Entry */ lookupLanguageNames( lastname ); + ding->loadDict( lastname ); query_co->setCurrentItem( e ); top_name->setText( top_name_content ); bottom_name->setText( bottom_name_content ); @@ -128,16 +127,13 @@ void ODict::saveConfig() Config cfg ( "odict" ); cfg.setGroup( "generalsettings" ); cfg.writeEntry( "casesens" , casesens ); cfg.writeEntry( "regexp" , regexp ); - cfg.writeEntry( "completewords" , completewords ); cfg.writeEntry( "lastdict" , query_co->currentText() ); } void ODict::slotStartQuery() { - qDebug( "bin in slotStartQuery()" ); - QString querystring = query_le->text(); if ( !querystring.isEmpty() ) { /* @@ -148,9 +144,9 @@ void ODict::slotStartQuery() switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ), tr( "No dictionary defined" ), tr( "&Define one" ), tr( "&Cancel" ), - 0, // Define a dict choosen + 0, // Define a dict 1 ) ) // Cancel choosen { case 0: slotSettings(); @@ -163,25 +159,11 @@ void ODict::slotStartQuery() /* * ok, the user has defined a dict */ ding->setCaseSensitive( casesens ); - ding->setCompleteWord( completewords ); - - qDebug( "activated_name ist:" ); - qDebug( activated_name ); - - ding->setDict( activated_name ); - -//X if ( activated_name != ding->loadedDict() ) - ding->loadDict(activated_name); BroswerContent test = ding->setText( querystring ); - qDebug( querystring ); - if ( ding->isCaseSensitive ) - qDebug( "ist CS"); - else qDebug( "kein CS" ); - browser_top->setText( test.top ); browser_bottom->setText( test.bottom ); } } @@ -204,15 +186,8 @@ void ODict::slotSetParameter( int count ) } if ( count == 1 ) { - if ( completewords ) - completewords = false; - else - completewords = true; - } - if ( count == 2 ) - { if ( regexp ) regexp = false; else regexp = true; @@ -225,10 +200,11 @@ void ODict::slotMethodChanged( const QString& methodnumber ) activated_name = methodnumber; qDebug( "activated_name in slotMethodChanged() ist:" ); qDebug( activated_name ); + qDebug( ding->loadedDict() ); -//X if ( activated_name != ding->loadedDict() ) + if ( activated_name != ding->loadedDict() ) { ding->loadDict(activated_name); lookupLanguageNames( activated_name ); @@ -249,9 +225,8 @@ void ODict::setupMenus() parameter = new QPopupMenu( menu ); connect( parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) ); parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 ); - parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ; parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); parameter->insertSeparator(); menu->insertItem( tr( "Settings" ) , settings ); |