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
@@ -1,95 +1,105 @@
 /***************************************************************************
   application:             : ODict
   begin                    : December 2002
   copyright                : ( C ) 2002, 2003 by Carsten Niehaus
   email                    : cniehaus@handhelds.org
 **************************************************************************/
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * 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 "dingwidget.h"
 #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(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;
        
        if(  file.open(  IO_ReadOnly ) )
        {
                QTextStream stream(  &file );
                while ( !stream.eof() )
                {
                        lines.append(  stream.readLine() );
                }
                file.close();
        }
        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;
         QString left;
         QString right;
        QString html_header      = "<html><table>";
        QString html_footer      = "</table></html>";
        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;
        for( QStringList::Iterator it = lines.begin() ; it != lines.end() ; ++it )
        {
                current = *it;
                left = current.left( current.find(reg_div) );
                right = current.right( current.length() - current.find(reg_div) - 1 );
                if ( left.contains( reg_word ) )
                {
                  left.replace( queryword, substitute );
                  toplist.append( html_table_left + left + html_table_sep + right + html_table_right );
                }
                else
                {
                  right.replace( reg_word, substitute );
                  bottomlist.append( html_table_left + right + html_table_sep + left + html_table_right );
                }
        }
                
        //thats it, the lists are rendered. Lets put them in one string
        bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
        top    = html_header + toplist.join( "<br>" )    + html_footer;
 }
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
@@ -1,28 +1,31 @@
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * 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 <qwidget.h>
 class QString;
 class QTextBrowser;
 class QString;
 class QStringList;
 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
@@ -1,173 +1,181 @@
 /***************************************************************************
   application:             : ODict
   begin                    : December 2002
   copyright                : ( C ) 2002, 2003 by Carsten Niehaus
   email                    : cniehaus@handhelds.org
 **************************************************************************/
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * 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 "odict.h"
 #include "configdlg.h"
 #include "dingwidget.h"
 #include <qlayout.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpe/config.h>
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmainwindow.h>
 #include <qstring.h>
 #include <qaction.h>
 #include <qtextbrowser.h>
 #include <qcombobox.h>
 #include <qpe/resource.h>
 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 );
        loadConfig();
        setCentralWidget( vbox );
 }
 void ODict::loadConfig()
 {
        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();
        QStringList groupListCfg = cfg.groupList().grep( "Method_" );
        for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
        {
                cfg.setGroup( *it );
                query_co->insertItem( cfg.readEntry( "Name" ) );
        }
 }
 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::slotDisplayAbout()
 {
        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20030103" ) );
 }
 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 )
 {
        errorTol = count;
 }
 void ODict::slotSettings()
 {
        ConfigDlg dlg( this, "Config" , true);
        if ( dlg.exec() == QDialog::Accepted )
                dlg.writeEntries();
        else qDebug( "abgebrochen" );
 }
 void ODict::slotSetParameter( int count )
 {
         if ( count == 0 )
        {
                if ( casesens )
                        casesens = false;
                else
                        casesens = true;
        }
         if ( count == 1 )
        {
                if ( completewords )
                        completewords = false;
                else
                        completewords = true;
        }
         if ( count == 2 )
        {
                if ( regexp )
                        regexp = false;
                else
                        regexp = true;
        }
         else qWarning( "ERROR" );
 }
+void ODict::slotMethodChanged( int methodnumber )
+{
+        activated_name = query_co->currentText();
+}
 void ODict::setupMenus()
 {
        menu = new QMenuBar( this );
        
        settings = new QPopupMenu( menu );
        setting_a = new QAction(tr(  "Config" ), Resource::loadPixmap(  "today/config" ), QString::null, 0, this, 0 );
        connect( setting_a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
        setting_a->addTo( settings );
        setting_b = new QAction(tr(  "Searchmethods" ), Resource::loadPixmap(  "today/config" ), QString::null, 0, this, 0 );
        
        parameter = new QPopupMenu( menu );
        connect(  parameter, SIGNAL( activated( int ) ), this, SLOT( slotSetParameter( int ) ) );
        parameter->insertItem( tr( "C&ase sensitive" ), 0 ,0 );
        parameter->insertItem( tr( "Only &complete Words" ), 1 , 1) ;
        parameter->insertItem( tr( "Allow &reg. 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 );
        
        help = new QPopupMenu( menu );
        help->insertItem("&About",this,SLOT( slotDisplayAbout() ));
        menu->insertItem( tr( "Settings" ) , settings );
        menu->insertItem( tr( "Parameter" ) , parameter );
        menu->insertItem( tr( "Help" ) , help );
 }
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
@@ -1,63 +1,66 @@
 /***************************************************************************
 *                                                                         *
 * This program is free software; you can redistribute it and/or modify    *
 * 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 QVBox;
 class QPopupMenu;
 class QMenuBar;
 class QHBox;
 class QPushButton;
 class QLineEdit;
 class QAction;
 class QVBoxLayout;
 class QActionGroup;
 class DingWidget;
 class QTextBrowser;
 class QComboBox;
 class ODict : public QMainWindow
 {
        Q_OBJECT
        
    public:
                ODict();
                QVBox *vbox;
                QTextBrowser *browser_top,
                                         *browser_bottom;
        private:
                QPopupMenu *help, *settings, *parameter, *error_tol_menu;
                QMenuBar *menu;
                QHBox *hbox;
                QLineEdit *query_le;
                QComboBox *query_co;
                QPushButton *ok_button;
                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 );
 };