From 8bf3021bf5e86f7f6f6083606d77427adc8d13a7 Mon Sep 17 00:00:00 2001 From: cniehaus Date: Sat, 10 May 2003 13:16:54 +0000 Subject: quite some changes --- (limited to 'noncore/apps/odict') diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp index 1608486..400298d 100644 --- a/noncore/apps/odict/configdlg.cpp +++ b/noncore/apps/odict/configdlg.cpp @@ -66,11 +66,6 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa showMaximized(); } -void ConfigDlg::writeEntries() -{ - //XXX wozu gibt es diese Methode? -} - void ConfigDlg::slotNewMethod() { SearchMethodDlg dlg( this, "SearchMethodDlg", true ); diff --git a/noncore/apps/odict/configdlg.h b/noncore/apps/odict/configdlg.h index 2b7d0a1..e3ef3ce 100644 --- a/noncore/apps/odict/configdlg.h +++ b/noncore/apps/odict/configdlg.h @@ -14,7 +14,6 @@ class QPushButton; #include - class ConfigDlg : public QDialog { Q_OBJECT @@ -22,8 +21,6 @@ class ConfigDlg : public QDialog public: ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE ); - void writeEntries(); - private: OTabWidget *tab; QWidget *settings_tab, *search_tab; diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index 0707bfb..ed67abf 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -18,17 +18,10 @@ #include #include -#include -#include -#include -#include -#include #include #include #include #include -#include -//#include // for getenv DingWidget::DingWidget( ) { @@ -39,11 +32,16 @@ DingWidget::DingWidget( ) void DingWidget::loadDict( QString name ) { + qDebug( "bin in DingWidget::loadDict(). name ist:" ); + qDebug( name ); + dictName = name; Config cfg( "odict" ); - if ( !methodname ) return; + if ( !methodname ) { return; } cfg.setGroup( "Method_" + methodname ); QFile file( cfg.readEntry( "file" ) ); + + qDebug( cfg.readEntry( "file" ) ); if( file.open( IO_ReadOnly ) ) { @@ -55,9 +53,10 @@ void DingWidget::loadDict( QString name ) file.close(); } loadValues(); + } -QString DingWidget::loadedDict() +QString DingWidget::loadedDict() const { return dictName; } @@ -102,6 +101,8 @@ BroswerContent DingWidget::setText( QString word ) BroswerContent DingWidget::parseInfo() { + qDebug( "bin in DingWidget::parseInfo()" ); + if ( isCompleteWord ) queryword = " " + queryword + " "; QStringList search = lines.grep( queryword , isCaseSensitive ); diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index d8466cb..dbb55e2 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h @@ -26,7 +26,7 @@ class DingWidget void setCaseSensitive( bool ); void setCompleteWord( bool ); void loadDict( QString ); - QString loadedDict(); + QString loadedDict() const; void setQueryWord( QString ); void setDict( QString ); void loadValues(); @@ -34,12 +34,12 @@ class DingWidget QString lang1_name, lang2_name; + bool isCaseSensitive; private: BroswerContent parseInfo(); BroswerContent s_strings; bool isCompleteWord; - bool isCaseSensitive; QString dictName; diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index cb9c4e0..0745f53 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -53,9 +53,12 @@ ODict::ODict() : QMainWindow() connect( query_co , SIGNAL( activated(const QString&) ), this, SLOT( slotMethodChanged(const QString&) ) ); 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(); @@ -67,37 +70,75 @@ ODict::ODict() : QMainWindow() void ODict::loadConfig() { + /* + * the name of the last used dictionary + */ + QString lastname; + Config cfg ( "odict" ); cfg.setGroup( "generalsettings" ); - errorTol = cfg.readEntry( "errtol" ).toInt(); 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 ); - query_co->insertItem( cfg.readEntry( "Name" ) ); + name = cfg.readEntry( "Name" ); + query_co->insertItem( name ); + + /* + * this check is to look up what dictionary has been used the + * last time + */ + if ( lastDict == name ) + { + e = i; + lastname = name; + } + i++; } -//XXX slotMethodChanged( "1" ); //FIXME: this line should not contain a integer + /* + * now set the two names of the dictionary and the correct QComboBox-Entry + */ + + lookupLanguageNames( 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( "errtol" , errorTol ); cfg.writeEntry( "casesens" , casesens ); cfg.writeEntry( "regexp" , regexp ); cfg.writeEntry( "completewords" , completewords ); + cfg.writeEntry( "lastdict" , query_co->currentText() ); } void ODict::slotStartQuery() { - if ( !query_le->text( ).isEmpty() ) + qDebug( "bin in slotStartQuery()" ); + + QString querystring = query_le->text(); + if ( !querystring.isEmpty() ) { /* * if the user has not yet defined a dictionary @@ -111,7 +152,6 @@ void ODict::slotStartQuery() 0, // Define a dict choosen 1 ) ) // Cancel choosen { - case 0: slotSettings(); break; @@ -123,37 +163,34 @@ void ODict::slotStartQuery() /* * ok, the user has defined a dict */ - QString querystring = query_le->text(); ding->setCaseSensitive( casesens ); ding->setCompleteWord( completewords ); + + qDebug( "activated_name ist:" ); + qDebug( activated_name ); + ding->setDict( activated_name ); - top_name->setText( ding->lang1_name ); - bottom_name->setText( ding->lang2_name ); - if ( activated_name != ding->loadedDict() ) +//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::slotSetErrorcount( int count ) -{ - errorTol = count; -} - void ODict::slotSettings() { ConfigDlg dlg( this, "Config" , true); if ( dlg.exec() == QDialog::Accepted ) - { - dlg.writeEntries(); - loadConfig(); - } + saveConfig(); } void ODict::slotSetParameter( int count ) @@ -180,20 +217,24 @@ void ODict::slotSetParameter( int count ) else regexp = true; } - else qWarning( "ERROR" ); + saveConfig(); } void ODict::slotMethodChanged( const QString& methodnumber ) { activated_name = methodnumber; - if ( activated_name != ding->loadedDict() ) - ding->loadDict(activated_name); + qDebug( "activated_name in slotMethodChanged() ist:" ); + qDebug( activated_name ); - top_name->setText( ding->lang1_name ); - top_name->setAlignment( AlignHCenter ); - bottom_name->setText( ding->lang2_name ); - bottom_name->setAlignment( AlignHCenter ); +//X 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() @@ -212,17 +253,6 @@ void ODict::setupMenus() parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ; parameter->insertItem( tr( "Allow ®. expressions" ), 2 ); parameter->insertSeparator(); - error_tol_menu = new QPopupMenu( menu ); - error_tol_menu->setCheckable( TRUE ); - connect( error_tol_menu, SIGNAL( activated( int ) ), this, SLOT( slotSetErrorcount( int ) ) ); - - error_tol_menu->insertItem( tr( "0 Errors" ), 0 ); - error_tol_menu->insertItem( tr( "1 Errors" ), 1 ); - error_tol_menu->insertItem( tr( "2 Errors" ), 2 ); - error_tol_menu->insertItem( tr( "3 Errors" ), 3 ); - error_tol_menu->insertItem( tr( "4 Errors" ), 4 ); - error_tol_menu->insertItem( tr( "Until Hit" ), 5 ); - parameter->insertItem( tr( "&Error tolerance" ), error_tol_menu ); menu->insertItem( tr( "Settings" ) , settings ); menu->insertItem( tr( "Parameter" ) , parameter ); diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index b9a0778..9c037ea 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h @@ -36,7 +36,7 @@ class ODict : public QMainWindow DingWidget *ding; private: - QPopupMenu *help, *settings, *parameter, *error_tol_menu; + QPopupMenu *help, *settings, *parameter; QMenuBar *menu; QHBox *hbox; QLineEdit *query_le; @@ -49,7 +49,6 @@ class ODict : public QMainWindow void setupMenus(); - int errorTol; bool casesens, completewords, regexp; void loadConfig(); @@ -58,10 +57,13 @@ class ODict : public QMainWindow QString activated_name; QLabel *bottom_name, *top_name; + + QString top_name_content, bottom_name_content; + + void lookupLanguageNames( QString ); private slots: void slotStartQuery(); - void slotSetErrorcount( int ); void slotSettings(); void slotSetParameter( int ); void slotMethodChanged( const QString& ); diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp index 8a14703..99cd8db 100644 --- a/noncore/apps/odict/searchmethoddlg.cpp +++ b/noncore/apps/odict/searchmethoddlg.cpp @@ -91,7 +91,7 @@ void SearchMethodDlg::setupEntries( QString item ) void SearchMethodDlg::slotBrowse() { - itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath()); + itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath()); dictFileLE->setText( itemName ); } diff --git a/noncore/apps/odict/searchmethoddlg.h b/noncore/apps/odict/searchmethoddlg.h index d98842f..706bbc1 100644 --- a/noncore/apps/odict/searchmethoddlg.h +++ b/noncore/apps/odict/searchmethoddlg.h @@ -17,7 +17,6 @@ class QString; #include - class SearchMethodDlg : public QDialog { Q_OBJECT -- cgit v0.9.0.2