265 lines diff :) mostly markupstuff. But also one bug less

5 files changed, 31 insertions, 14 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
@@ -69,5 +69,5 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 void ConfigDlg::writeEntries()
 {
-        qDebug( "richtig beendet" );
+        //XXX wozu gibt es diese Methode?
 }
                 
@@ -77,10 +77,8 @@ void ConfigDlg::slotNewMethod()
         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" );
 }
 
@@ -92,12 +90,9 @@ void ConfigDlg::slotChangeMethod()
                 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" );
 }
 
@@ -113,5 +108,4 @@ void ConfigDlg::slotDeleteMethod()
                 list->takeItem( list->selectedItem() );
         }
-        else qDebug("no item selected"); 
 }
 
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
@@ -90,4 +90,6 @@ void DingWidget::loadValues()
         cfg.setGroup( "Method_" + methodname );
         trenner = cfg.readEntry( "Seperator" );
+        lang1_name = cfg.readEntry( "Lang1" );
+        lang2_name = cfg.readEntry( "Lang2" );
 }
 
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
@@ -32,4 +32,7 @@ class DingWidget
                 void loadValues();
 
+                QString lang1_name,
+                                lang2_name;
+
         private:
                 BroswerContent parseInfo();
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
+        //XXXslotMethodChanged( "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 );
 }
 
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
@@ -10,4 +10,5 @@
 #include <qmainwindow.h>
 
+class QLabel;
 class QVBox;
 class QPopupMenu;
@@ -56,4 +57,6 @@ class ODict : public QMainWindow
 
                 QString activated_name;
+                QLabel  *bottom_name,
+                                *top_name;
         
         private slots:
@@ -62,4 +65,4 @@ class ODict : public QMainWindow
                 void slotSettings();
                 void slotSetParameter( int );
-                void slotMethodChanged( int );
+                void slotMethodChanged( const QString& );
 };