| -rw-r--r-- | noncore/apps/odict/odict.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
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 @@ -47,11 +47,14 @@ ODict::ODict() : QMainWindow() 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 ); @@ -79,5 +82,5 @@ void ODict::loadConfig() 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 } @@ -95,4 +98,6 @@ void ODict::saveConfig() void ODict::slotStartQuery() { + if ( !query_le->text( ).isEmpty() ) + { /* * if the user has not yet defined a dictionary @@ -123,4 +128,6 @@ void ODict::slotStartQuery() ding->setCompleteWord( completewords ); ding->setDict( activated_name ); + top_name->setText( ding->lang1_name ); + bottom_name->setText( ding->lang2_name ); if ( activated_name != ding->loadedDict() ) @@ -132,4 +139,5 @@ void ODict::slotStartQuery() browser_bottom->setText( test.bottom ); } +} @@ -147,5 +155,4 @@ void ODict::slotSettings() loadConfig(); } - else qDebug( "abgebrochen" ); } @@ -177,7 +184,15 @@ void ODict::slotSetParameter( int count ) } -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 ); } |