| -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 @@ -23,68 +23,59 @@ #include <qstringlist.h> #include <qregexp.h> DingWidget::DingWidget( ) { methodname = QString::null; trenner = QString::null; lines = 0L; } 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() ) { lines.append( stream.readLine() ); } file.close(); } loadValues(); - } QString DingWidget::loadedDict() const { return dictName; } void DingWidget::setCaseSensitive( bool caseS ) { isCaseSensitive = caseS; } void DingWidget::setDict( QString dict ) { methodname = dict; } -void DingWidget::setCompleteWord( bool cword ) -{ - isCompleteWord = cword; -} - void DingWidget::setQueryWord( QString qword ) { queryword = qword; } void DingWidget::loadValues() { if ( !methodname ) return; Config cfg( "odict" ); cfg.setGroup( "Method_" + methodname ); trenner = cfg.readEntry( "Seperator" ); @@ -92,33 +83,29 @@ void DingWidget::loadValues() lang2_name = cfg.readEntry( "Lang2" ); } BroswerContent DingWidget::setText( QString word ) { queryword = word; return parseInfo(); } 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; 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() ); @@ -130,15 +117,16 @@ BroswerContent DingWidget::parseInfo() toplist.append( left ); } else { 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; } + 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 @@ -13,38 +13,37 @@ * the Free Software Foundation; either version 2 of the License, or * * ( at your option ) any later version. * * * **************************************************************************/ #include "odict.h" #include "configdlg.h" #include "dingwidget.h" #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> #include <qlineedit.h> #include <qmainwindow.h> #include <qstring.h> #include <qaction.h> #include <qtextbrowser.h> #include <qcombobox.h> #include <qpe/resource.h> - +#include <qpe/config.h> ODict::ODict() : QMainWindow() { activated_name = QString::null; vbox = new QVBox( this ); setCaption( tr( "OPIE-Dictionary" ) ); setupMenus(); QHBox *hbox = new QHBox( vbox ); QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show(); @@ -54,41 +53,40 @@ ODict::ODict() : QMainWindow() ok_button = new QPushButton( tr( "&Ok" ), hbox ); connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) ); 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() { /* * the name of the last used dictionary */ QString lastname; 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; QStringList groupListCfg = cfg.groupList().grep( "Method_" ); query_co->clear(); for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) { QString name; cfg.setGroup( *it ); name = cfg.readEntry( "Name" ); query_co->insertItem( name ); @@ -100,160 +98,137 @@ void ODict::loadConfig() if ( lastDict == name ) { e = i; lastname = name; } i++; } /* * 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 ); } void ODict::lookupLanguageNames( QString dictname ) { Config cfg ( "odict" ); cfg.setGroup( "Method_"+dictname ); top_name_content = cfg.readEntry( "Lang1" ); bottom_name_content = cfg.readEntry( "Lang2" ); } 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() ) { /* * if the user has not yet defined a dictionary */ if ( !query_co->currentText() ) { 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(); break; case 1: // stop here return; } } /* * 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 ); } } void ODict::slotSettings() { ConfigDlg dlg( this, "Config" , true); if ( dlg.exec() == QDialog::Accepted ) saveConfig(); } void ODict::slotSetParameter( int count ) { if ( count == 0 ) { if ( casesens ) casesens = false; else casesens = true; } if ( count == 1 ) { - if ( completewords ) - completewords = false; - else - completewords = true; - } - if ( count == 2 ) - { if ( regexp ) regexp = false; else regexp = true; } saveConfig(); } 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 ); top_name->setText( top_name_content ); bottom_name->setText( bottom_name_content ); } } void ODict::setupMenus() { menu = new QMenuBar( this ); settings = new QPopupMenu( menu ); setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 ); connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) ); setting_a->addTo( settings ); setting_b = new QAction(tr( "Searchmethods" ), Resource::loadPixmap( "edit" ), QString::null, 0, this, 0 ); 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 ); menu->insertItem( tr( "Parameter" ) , parameter ); } |