author | cniehaus <cniehaus> | 2003-05-02 22:10:18 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2003-05-02 22:10:18 (UTC) |
commit | e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f (patch) (side-by-side diff) | |
tree | 6211385225d342dc9062615f080d5764d7251beb /noncore/apps | |
parent | adefcec2af37482266dbbd0e56b7e57f483c0540 (diff) | |
download | opie-e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f.zip opie-e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f.tar.gz opie-e83acc761bfe83ccd80b8ef6ab1275ee5c26e14f.tar.bz2 |
265 lines diff :) mostly markupstuff. But also one bug less
-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/odict/dingwidget.h | 3 | ||||
-rw-r--r-- | noncore/apps/odict/odict.cpp | 99 | ||||
-rw-r--r-- | noncore/apps/odict/odict.h | 5 |
5 files changed, 67 insertions, 50 deletions
diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp index eba7dec..1608486 100644 --- a/noncore/apps/odict/configdlg.cpp +++ b/noncore/apps/odict/configdlg.cpp @@ -63,61 +63,55 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa /*add the tabs and maximize*/ tab->addTab( settings_tab, "pass", tr( "General Settings" ) ); tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) ); showMaximized(); } void ConfigDlg::writeEntries() { - qDebug( "richtig beendet" ); + //XXX wozu gibt es diese Methode? } void ConfigDlg::slotNewMethod() { SearchMethodDlg dlg( this, "SearchMethodDlg", true ); if ( dlg.exec() == QDialog::Accepted ) { - //if ( !dlg.nameLE->text() ) return; //XXX dlg.saveItem(); QListViewItem *item = new QListViewItem( list ); item->setText( 0 , dlg.nameLE->text() ); } - else qDebug( "SearchMethodDlg abgebrochen" ); } void ConfigDlg::slotChangeMethod() { if ( list->selectedItem() ) { SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) ); if ( dlg.exec() == QDialog::Accepted ) { - //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht dlg.saveItem(); QListViewItem *item = list->selectedItem(); item->setText( 0 , dlg.nameLE->text() ); } - else qDebug( "SearchMethodDlg abgebrochen" ); } - else qDebug( "kein item angewählt" ); } void ConfigDlg::slotDeleteMethod() { if ( list->selectedItem() ) { Config cfg ( "odict" ); cfg.setGroup( "Method_"+list->selectedItem()->text(0) ); cfg.clearGroup(); //FIXME: this only removes the entries but not the group itself list->takeItem( list->selectedItem() ); } - else qDebug("no item selected"); } void ConfigDlg::loadSearchMethodNames() { Config cfg( "odict" ); QStringList groupListCfg = cfg.groupList().grep( "Method_" ); for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) { diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp index abb5e75..0707bfb 100644 --- a/noncore/apps/odict/dingwidget.cpp +++ b/noncore/apps/odict/dingwidget.cpp @@ -84,16 +84,18 @@ void DingWidget::setQueryWord( QString qword ) 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" ); } BroswerContent DingWidget::setText( QString word ) { queryword = word; return parseInfo(); } diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h index 74f40c9..d8466cb 100644 --- a/noncore/apps/odict/dingwidget.h +++ b/noncore/apps/odict/dingwidget.h @@ -25,16 +25,19 @@ class DingWidget QStringList lines; void setCaseSensitive( bool ); void setCompleteWord( bool ); void loadDict( QString ); QString loadedDict(); void setQueryWord( QString ); void setDict( QString ); void loadValues(); + + QString lang1_name, + lang2_name; private: BroswerContent parseInfo(); BroswerContent s_strings; bool isCompleteWord; bool isCaseSensitive; diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp index 9f9a8d9..cb9c4e0 100644 --- a/noncore/apps/odict/odict.cpp +++ b/noncore/apps/odict/odict.cpp @@ -41,28 +41,31 @@ 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(); + QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); + query_label->show(); query_le = new QLineEdit( hbox ); query_co = new QComboBox( hbox ); - connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) ); + 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 ); browser_top = new QTextBrowser( vbox ); + bottom_name = new QLabel( vbox ); browser_bottom = new QTextBrowser( vbox ); ding = new DingWidget(); ding->loadValues(); - + loadConfig(); setCentralWidget( vbox ); } void ODict::loadConfig() { Config cfg ( "odict" ); cfg.setGroup( "generalsettings" ); @@ -73,85 +76,89 @@ void ODict::loadConfig() QStringList groupListCfg = cfg.groupList().grep( "Method_" ); query_co->clear(); for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) { cfg.setGroup( *it ); query_co->insertItem( cfg.readEntry( "Name" ) ); } - slotMethodChanged( 1 ); //FIXME: this line should not contain a integer +//XXX slotMethodChanged( "1" ); //FIXME: this line should not contain a integer } 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 ); } void ODict::slotStartQuery() { - /* - * if the user has not yet defined a dictionary - */ - if ( !query_co->currentText() ) + if ( !query_le->text( ).isEmpty() ) { - switch ( QMessageBox::information( this, tr( "OPIE-Dictionary" ), - tr( "No dictionary defined" ), - tr( "&Define one" ), - tr( "&Cancel" ), - 0, // Define a dict choosen - 1 ) ) // Cancel choosen - { - - case 0: - slotSettings(); - break; - case 1: // stop here - return; - } - } - - /* - * ok, the user has defined a dict - */ - QString querystring = query_le->text(); - ding->setCaseSensitive( casesens ); - ding->setCompleteWord( completewords ); - ding->setDict( activated_name ); - - if ( activated_name != ding->loadedDict() ) - ding->loadDict(activated_name); - - BroswerContent test = ding->setText( querystring ); - - browser_top->setText( test.top ); - browser_bottom->setText( test.bottom ); + /* + * 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 + 1 ) ) // Cancel choosen + { + + case 0: + slotSettings(); + break; + case 1: // stop here + return; + } + } + + /* + * ok, the user has defined a dict + */ + QString querystring = query_le->text(); + ding->setCaseSensitive( casesens ); + ding->setCompleteWord( completewords ); + ding->setDict( activated_name ); + top_name->setText( ding->lang1_name ); + bottom_name->setText( ding->lang2_name ); + + if ( activated_name != ding->loadedDict() ) + ding->loadDict(activated_name); + + BroswerContent test = ding->setText( querystring ); + + 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(); } - else qDebug( "abgebrochen" ); } void ODict::slotSetParameter( int count ) { if ( count == 0 ) { if ( casesens ) casesens = false; @@ -171,19 +178,27 @@ void ODict::slotSetParameter( int count ) if ( regexp ) regexp = false; else regexp = true; } else qWarning( "ERROR" ); } -void ODict::slotMethodChanged( int /*methodnumber*/ ) +void ODict::slotMethodChanged( const QString& methodnumber ) { - activated_name = query_co->currentText(); + activated_name = methodnumber; + + if ( activated_name != ding->loadedDict() ) + ding->loadDict(activated_name); + + top_name->setText( ding->lang1_name ); + top_name->setAlignment( AlignHCenter ); + bottom_name->setText( ding->lang2_name ); + bottom_name->setAlignment( AlignHCenter ); } 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 ); diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h index 3065feb..b9a0778 100644 --- a/noncore/apps/odict/odict.h +++ b/noncore/apps/odict/odict.h @@ -4,16 +4,17 @@ * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * ( at your option ) any later version. * * * **************************************************************************/ #include <qmainwindow.h> +class QLabel; class QVBox; class QPopupMenu; class QMenuBar; class QHBox; class QPushButton; class QLineEdit; class QAction; class QVBoxLayout; @@ -50,16 +51,18 @@ class ODict : public QMainWindow int errorTol; bool casesens, completewords, regexp; void loadConfig(); void saveConfig(); QString activated_name; + QLabel *bottom_name, + *top_name; private slots: void slotStartQuery(); void slotSetErrorcount( int ); void slotSettings(); void slotSetParameter( int ); - void slotMethodChanged( int ); + void slotMethodChanged( const QString& ); }; |