author | cniehaus <cniehaus> | 2003-05-10 13:16:54 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-10 13:16:54 (UTC) |
commit | 8bf3021bf5e86f7f6f6083606d77427adc8d13a7 (patch) (side-by-side diff) | |
tree | 821e9798a7d388fe57ccf2e8cdc796bb147ca780 /noncore | |
parent | 882b5190d02c33aa8c893e8aa54bf3d38ac255c8 (diff) | |
download | opie-8bf3021bf5e86f7f6f6083606d77427adc8d13a7.zip opie-8bf3021bf5e86f7f6f6083606d77427adc8d13a7.tar.gz opie-8bf3021bf5e86f7f6f6083606d77427adc8d13a7.tar.bz2 |
quite some changes
-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/odict/configdlg.h | 3 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 19 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 4 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 106 | ||||
-rw-r--r-- | noncore/apps/odict/odict.h | 8 | ||||
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.h | 1 |
8 files changed, 86 insertions, 62 deletions
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 @@ -67,9 +67,4 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa } -void ConfigDlg::writeEntries() -{ - //XXX wozu gibt es diese Methode? -} - void ConfigDlg::slotNewMethod() { 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 @@ -15,5 +15,4 @@ class QPushButton; #include <qdialog.h> - class ConfigDlg : public QDialog { @@ -23,6 +22,4 @@ class ConfigDlg : public QDialog ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE ); - void writeEntries(); - private: OTabWidget *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 @@ -19,15 +19,8 @@ #include <qfile.h> #include <qpe/config.h> -#include <qhbox.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qmainwindow.h> #include <qstring.h> #include <qtextstream.h> #include <qstringlist.h> #include <qregexp.h> -#include <qtextbrowser.h> -//#include <stdlib.h> // for getenv DingWidget::DingWidget( ) @@ -40,9 +33,14 @@ 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 ) ) @@ -56,7 +54,8 @@ void DingWidget::loadDict( QString name ) } loadValues(); + } -QString DingWidget::loadedDict() +QString DingWidget::loadedDict() const { return dictName; @@ -103,4 +102,6 @@ BroswerContent DingWidget::setText( QString word ) BroswerContent DingWidget::parseInfo() { + qDebug( "bin in DingWidget::parseInfo()" ); + if ( isCompleteWord ) queryword = " " + queryword + " "; 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 @@ -27,5 +27,5 @@ class DingWidget void setCompleteWord( bool ); void loadDict( QString ); - QString loadedDict(); + QString loadedDict() const; void setQueryWord( QString ); void setDict( QString ); @@ -35,4 +35,5 @@ class DingWidget lang2_name; + bool isCaseSensitive; private: BroswerContent parseInfo(); @@ -40,5 +41,4 @@ class DingWidget 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 @@ -54,7 +54,10 @@ 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 ); @@ -68,21 +71,56 @@ 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() @@ -90,13 +128,16 @@ 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() ) { /* @@ -112,5 +153,4 @@ void ODict::slotStartQuery() 1 ) ) // Cancel choosen { - case 0: slotSettings(); @@ -124,16 +164,22 @@ 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 ); @@ -141,18 +187,9 @@ void ODict::slotStartQuery() } - -void ODict::slotSetErrorcount( int count ) -{ - errorTol = count; -} - void ODict::slotSettings() { ConfigDlg dlg( this, "Config" , true); if ( dlg.exec() == QDialog::Accepted ) - { - dlg.writeEntries(); - loadConfig(); - } + saveConfig(); } @@ -181,5 +218,5 @@ void ODict::slotSetParameter( int count ) regexp = true; } - else qWarning( "ERROR" ); + saveConfig(); } @@ -188,11 +225,15 @@ 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 ); + } } @@ -213,15 +254,4 @@ void ODict::setupMenus() 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 ); 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 @@ -37,5 +37,5 @@ class ODict : public QMainWindow private: - QPopupMenu *help, *settings, *parameter, *error_tol_menu; + QPopupMenu *help, *settings, *parameter; QMenuBar *menu; QHBox *hbox; @@ -50,5 +50,4 @@ class ODict : public QMainWindow void setupMenus(); - int errorTol; bool casesens, completewords, regexp; @@ -59,8 +58,11 @@ class ODict : public QMainWindow 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 ); 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 @@ -92,5 +92,5 @@ 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 @@ -18,5 +18,4 @@ class QString; #include <qdialog.h> - class SearchMethodDlg : public QDialog { |