2 files changed, 56 insertions, 9 deletions

diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 7f369d4..0412807 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -17,101 +17,142 @@
 #include "odict.h"
 #include "configdlg.h"
 
 #include <opie/otabwidget.h>
 
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpe/config.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qmainwindow.h>
 #include <qstring.h>
 #include <qaction.h>
 
 #include <qpe/resource.h>
 
 
 ODict::ODict() : QMainWindow()
 {
         setCaption( tr( "OPIE-Dictionary" ) );
         setupMenus();
 
         QHBox *hbox = new QHBox( this );
         QLabel* query_label = new QLabel( tr( "Query:" ) , hbox ); query_label->show();
         query_le = new QLineEdit( hbox );
         ok_button = new QPushButton( tr( "&Ok" ), hbox );
         connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
         
         setCentralWidget( hbox );
+        loadConfig();
+}
+
+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();
+}
+
+
+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 0.1" ) );
+        QMessageBox::about(  this, tr( "About ODict" ), tr( "OPIE-Dictionary ODict \n (c) 2002, 2003 Carsten  Niehaus \n cniehaus@handhelds.org \n Version 20021230" ) );
 }
 
 void ODict::slotStartQuery()
 {
         QString querystring = query_le->text();
 }
 
 
 void ODict::slotSetErrorcount( int count )
 {
-        count = 1;
+        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*/ )
+void ODict::slotSetParameter( int count )
 {
-        //X if ( int == 0 )
-        //X if ( int == 1 )
-        //X if ( int == 2 )
-        //X else qWarning( "ERROR" );
+         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::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 );
-        parameter->insertItem( tr( "Only &complete Words" ), 1 ) ;
+        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 30307c1..014e488 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -5,40 +5,46 @@
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 
 #include <qmainwindow.h>
 
 class QPopupMenu;
 class QMenuBar;
 class QHBox;
 class QPushButton;
 class QLineEdit;
 class QAction;
 class QActionGroup;
 
 class ODict : public QMainWindow
 {
         Q_OBJECT
         
     public:
                 ODict();
 
         private:
                 QPopupMenu *help, *settings, *parameter, *error_tol_menu;
                 QMenuBar *menu;
                 QHBox *hbox;
                 QLineEdit *query_le;
                 QPushButton *ok_button;
 
                 QAction *setting_a, *setting_b;
                 
                 void setupMenus();
+
+                int errorTol;
+                bool casesens, completewords, regexp;
+                
+                void loadConfig();
+                void saveConfig();
         
         private slots:
                 void slotDisplayAbout();
                 void slotStartQuery();
                 void slotSetErrorcount( int );
                 void slotSettings();
                 void slotSetParameter( int );
 };