4 files changed, 30 insertions, 6 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 8f5a7ae..b69a803 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -29,11 +29,14 @@
 #include <qregexp.h>
 #include <qtextbrowser.h>
 #include <stdlib.h> // for getenv
 
-DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom) : QWidget(parent)
+DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top, QTextBrowser *browser_bottom, QString activated_name) : QWidget(parent)
 {
+        methodname = activated_name;
         queryword = word;
+        trenner = QString::null;
+        loadValues();
           QString opie_dir = getenv("OPIEDIR");
         QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
         QStringList lines;
         
@@ -49,14 +52,20 @@ DingWidget::DingWidget(QWidget *parent, QString word, QTextBrowser *browser_top,
 
         lines = lines.grep( queryword );
 
         QString top, bottom;
-
-        parseInfo( lines, top , bottom );
+        //parseInfo( lines, top , bottom );
         browser_top->setText( top );
         browser_bottom->setText( bottom );
 }
 
+void DingWidget::loadValues()
+{
+        Config cfg(  "odict" );
+        cfg.setGroup( "Method_"+methodname );
+        trenner = cfg.readEntry( "Seperator" );
+}
+
 void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
 {
 
          QString current;
@@ -67,8 +76,9 @@ void DingWidget::parseInfo( QStringList &lines, QString &top, QString &bottom )
         QString html_table_left  = "<tr><td width='50'>";
         QString html_table_sep   = "</td><td>";
         QString html_table_right = "</td></tr>";
         QRegExp reg_div( "\\" );
+        //QRegExp reg_div( trenner );
         QRegExp reg_word( queryword );
         //QString substitute = "<font color=red>"+queryword+"</font>";
         QString substitute = "<a href=''>"+queryword+"</a>";
         QStringList toplist, bottomlist;
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index cba1edf..66379fe 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -18,11 +18,14 @@ class DingWidget : public QWidget
 {
         Q_OBJECT
         
     public:
-                DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0);
+                DingWidget(QWidget *parent = 0, QString word = 0, QTextBrowser* = 0, QTextBrowser* =0, QString activated_name=0);
 
         private:
                 QString search_word;
                 void parseInfo( QStringList& , QString&, QString& );
                 QString queryword;
+                void loadValues();
+                QString methodname;
+                QString trenner;
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 7de9169..2857c65 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -38,16 +38,19 @@
 
 
 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();
         query_le = new QLineEdit( hbox );
         query_co = new QComboBox( hbox );
+        connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
         ok_button = new QPushButton( tr( "&Ok" ), hbox );
         connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
         browser_top = new QTextBrowser( vbox );
         browser_bottom = new QTextBrowser( vbox );
@@ -91,9 +94,9 @@ void ODict::slotDisplayAbout()
 
 void ODict::slotStartQuery()
 {
         QString querystring = query_le->text();
-        DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom);
+        DingWidget *ding = new DingWidget( vbox , querystring , browser_top, browser_bottom, activated_name);
 }
 
 
 void ODict::slotSetErrorcount( int count )
@@ -135,8 +138,13 @@ void ODict::slotSetParameter( int count )
         }
          else qWarning( "ERROR" );
 }
 
+void ODict::slotMethodChanged( int methodnumber )
+{
+        activated_name = query_co->currentText();
+}
+
 void ODict::setupMenus()
 {
         menu = new QMenuBar( this );
         
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index 7c1f32f..5096c5e 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -43,21 +43,24 @@ class ODict : public QMainWindow
                 QVBoxLayout *vbox_layout;
 
                 QAction *setting_a, *setting_b;
 
-                //DingWidget *ding;
+                DingWidget *ding;
                 
                 void setupMenus();
 
                 int errorTol;
                 bool casesens, completewords, regexp;
                 
                 void loadConfig();
                 void saveConfig();
+
+                QString activated_name;
         
         private slots:
                 void slotDisplayAbout();
                 void slotStartQuery();
                 void slotSetErrorcount( int );
                 void slotSettings();
                 void slotSetParameter( int );
+                void slotMethodChanged( int );
 };