quite some changes

8 files changed, 86 insertions, 62 deletions

diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 1608486..400298d 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -45,53 +45,48 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
         search_tab = new QWidget( tab , "search_tab" );
         QVBoxLayout *vbox_layout_searchtab = new QVBoxLayout( search_tab, 4 , 4 ,"blah" );
         
         QHBox *hbox = new QHBox( search_tab );
         list = new QListView( hbox );
         list->addColumn( tr( "Searchmethod" ) );
         loadSearchMethodNames();
         
         QVBox *vbox = new QVBox( hbox );
         new_button = new QPushButton( "New" , vbox );
         change_button = new QPushButton( "Change" , vbox );
         delete_button = new QPushButton( "Delete" , vbox );
         connect( new_button, SIGNAL( clicked() ), this, SLOT( slotNewMethod() ) );
         connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() ));
         connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() ));
         
         vbox_layout_searchtab->addWidget( hbox );
 
         /*add the tabs and maximize*/
         tab->addTab( settings_tab, "pass", tr( "General Settings" ) );
         tab->addTab( search_tab, "zoom", tr( "Searchmethods" ) );
         showMaximized();
 }
 
-void ConfigDlg::writeEntries()
-{
-        //XXX wozu gibt es diese Methode?
-}
-                
 void ConfigDlg::slotNewMethod()
 {
         SearchMethodDlg dlg( this, "SearchMethodDlg", true );
         if ( dlg.exec() == QDialog::Accepted )
         {
                 dlg.saveItem();
                 QListViewItem *item = new QListViewItem( list );
                 item->setText( 0 , dlg.nameLE->text() );
         }
 }
 
 void ConfigDlg::slotChangeMethod()
 {
         if ( list->selectedItem() )
         {
                 SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) );
                 if ( dlg.exec() == QDialog::Accepted )
                 {
                         dlg.saveItem();
                         QListViewItem *item = list->selectedItem();
                         item->setText( 0 , dlg.nameLE->text() );
                 }
         }
 }
diff --git a/noncore/apps/odict/configdlg.h b/noncore/apps/odict/configdlg.h
index 2b7d0a1..e3ef3ce 100644
--- a/noncore/apps/odict/configdlg.h
+++ b/noncore/apps/odict/configdlg.h
@@ -1,39 +1,36 @@
 /***************************************************************************
  *                                                                         *
  * 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.                                   *
  *                                                                         *
  **************************************************************************/
 
 class QWidget;
 class OTabWidget;
 class QListView;
 class QPushButton;
 
 #include <qdialog.h>
 
-
 class ConfigDlg : public QDialog
 {
         Q_OBJECT
         
     public:
                 ConfigDlg(QWidget *parent, const char *name, bool modal=FALSE );
 
-                void writeEntries();
-
         private:
                 OTabWidget *tab;
                 QWidget *settings_tab, *search_tab;
                 QListView *list;
                 QPushButton *new_button, *change_button, *delete_button;
 
                 void loadSearchMethodNames();
 
         private slots:
                 void slotNewMethod();
                 void slotChangeMethod();
                 void slotDeleteMethod();
 };
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 0707bfb..ed67abf 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -1,128 +1,129 @@
 /***************************************************************************
    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( )
 {
         methodname = QString::null;
         trenner = QString::null;
         lines = 0L;
 }
 
 void DingWidget::loadDict( QString name )
 {
+        qDebug( "bin in DingWidget::loadDict(). name ist:" );
+        qDebug( name );
+        
         dictName = name;
         Config cfg(  "odict" );
-        if ( !methodname ) return;
+        if ( !methodname ) { return; }
         cfg.setGroup( "Method_" + methodname );
         QFile file( cfg.readEntry( "file" )  );
+
+        qDebug( cfg.readEntry( "file" ) );
         
         if(  file.open(  IO_ReadOnly ) )
         {
                 QTextStream stream(  &file );
                 while ( !stream.eof() )
                 {
                         lines.append(  stream.readLine() );
                 }
                 file.close();
         }
         loadValues();
+
 }
 
-QString DingWidget::loadedDict()
+QString DingWidget::loadedDict() const
 { 
         return dictName;
 }
 
 void DingWidget::setCaseSensitive( bool caseS )
 {
         isCaseSensitive = caseS;
 }
 
 void DingWidget::setDict( QString dict )
 {
         methodname = dict;
 }
 
 void DingWidget::setCompleteWord( bool cword )
 {
         isCompleteWord = cword;
 }
 
 void DingWidget::setQueryWord( QString qword )
 {
         queryword = qword;
 }
 
 
 void DingWidget::loadValues()
 {
         if ( !methodname ) return;
         Config cfg(  "odict" );
         cfg.setGroup( "Method_" + methodname );
         trenner = cfg.readEntry( "Seperator" );
         lang1_name = cfg.readEntry( "Lang1" );
         lang2_name = cfg.readEntry( "Lang2" );
 }
 
 BroswerContent DingWidget::setText( QString word )
 {
         queryword = word;
         return parseInfo();
 }
 
 
 BroswerContent DingWidget::parseInfo()
 {
+        qDebug( "bin in DingWidget::parseInfo()" );
+
         if ( isCompleteWord ) 
                 queryword = " " + queryword + " ";
         QStringList search = lines.grep( queryword , isCaseSensitive );
 
          QString current;
          QString left;
          QString right;
         QRegExp reg_div( trenner );
         QRegExp reg_word( queryword );
         reg_word.setCaseSensitive( isCaseSensitive );
         QStringList toplist, bottomlist;
         QString substitute = "<strong>"+queryword+"</strong>";
 
         for( QStringList::Iterator it = search.begin() ; it != search.end() ; ++it )
         {
                 current = *it;
                 left = current.left( current.find( trenner ) );
                 
                 right = current.right( current.length() - current.find(trenner) - trenner.length() );
 
                 if ( left.contains( queryword , isCaseSensitive ) )
                 {
                         left.replace( queryword, substitute );
                         left = left + " --> " + right;
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index d8466cb..dbb55e2 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -5,46 +5,46 @@
  * the Free Software Foundation; either version 2 of the License, or       *
  * ( at your option ) any later version.                                   *
  *                                                                         *
  **************************************************************************/
 
 #include <qstringlist.h>
 #include <qstring.h>
 
 struct BroswerContent
 { 
         QString top;
         QString bottom;
 };
 
 class DingWidget
 {
     public:
                 DingWidget();
 
                 BroswerContent setText( QString );
                 QStringList lines;
                 void setCaseSensitive( bool );
                 void setCompleteWord( bool );
                 void loadDict( QString );
-                QString loadedDict();
+                QString loadedDict() const;
                 void setQueryWord( QString );
                 void setDict( QString );
                 void loadValues();
                 
                 QString lang1_name,
                                 lang2_name;
 
+                bool isCaseSensitive;
         private:
                 BroswerContent parseInfo();
 
                 BroswerContent s_strings;
                 bool isCompleteWord;
-                bool isCaseSensitive;
 
                 QString dictName;
                 
                 QString search_word;
                 QString queryword;
                 QString methodname;
                 QString trenner;
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index cb9c4e0..0745f53 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -32,198 +32,228 @@
 #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(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 );
+        top_name->setAlignment( AlignHCenter );
         browser_top = new QTextBrowser( vbox );
         bottom_name = new QLabel( vbox );
+        bottom_name->setAlignment( AlignHCenter );
         browser_bottom = new QTextBrowser( vbox );
 
         ding = new DingWidget();
         ding->loadValues();
         
         loadConfig();
         setCentralWidget( vbox );
 }
 
 void ODict::loadConfig()
 {
+        /*
+         * the name of the last used dictionary
+         */
+        QString lastname;
+        
         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();
 
+        QString lastDict = cfg.readEntry( "lastdict" );
+        int i = 0, e = 0;
+        
         QStringList groupListCfg = cfg.groupList().grep( "Method_" );
         query_co->clear();
         for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
         {
+                QString name;
                 cfg.setGroup( *it );
-                query_co->insertItem( cfg.readEntry( "Name" ) );
+                name = cfg.readEntry( "Name" );
+                query_co->insertItem( name );
+
+                /*
+                 * this check is to look up what dictionary has been used the
+                 * last time
+                 */
+                if ( lastDict == name )
+                {
+                        e = i;
+                        lastname = name;
+                }
+                i++;
         }
-        //XXXslotMethodChanged( "1" );           //FIXME: this line should not contain a integer
+        /*
+         * now set the two names of the dictionary and the correct QComboBox-Entry
+         */
+
+        lookupLanguageNames( lastname );
+
+        query_co->setCurrentItem( e );
+        top_name->setText( top_name_content );
+        bottom_name->setText( bottom_name_content );
 }
 
+void ODict::lookupLanguageNames( QString dictname )
+{
+        Config cfg ( "odict" );
+        cfg.setGroup( "Method_"+dictname );
+        top_name_content = cfg.readEntry( "Lang1" ); 
+        bottom_name_content = cfg.readEntry( "Lang2" ); 
+}
 
 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 );
+        cfg.writeEntry( "lastdict" , query_co->currentText() );
 }
 
 void ODict::slotStartQuery()
 {
-        if ( !query_le->text( ).isEmpty() )
+        qDebug( "bin in slotStartQuery()" );
+        
+        QString querystring = query_le->text();
+        if ( !querystring.isEmpty() )
         {
                 /*
                  * if the user has not yet defined a dictionary
                  */
                 if ( !query_co->currentText() )
                 {
                         switch (  QMessageBox::information(  this, tr( "OPIE-Dictionary" ),
                                                 tr( "No dictionary defined" ),
                                                 tr( "&Define one" ), 
                                                 tr( "&Cancel" ),
                                                 0,      // Define a dict choosen
                                                 1 ) )   // Cancel choosen
                         { 
-
                                 case 0:
                                         slotSettings();
                                         break;
                                 case 1: // stop here
                                         return;
                         }
                         }                       
 
                 /*
                  * ok, the user has defined a dict
                  */
-                QString querystring = query_le->text();
                 ding->setCaseSensitive( casesens ); 
                 ding->setCompleteWord( completewords ); 
+
+                qDebug( "activated_name ist:" );
+                qDebug( activated_name );
+                
                 ding->setDict( activated_name );
-                top_name->setText(  ding->lang1_name );
-                bottom_name->setText( ding->lang2_name );
 
-                if ( activated_name != ding->loadedDict() )
+        //X     if ( activated_name != ding->loadedDict() )
                         ding->loadDict(activated_name);
 
                 BroswerContent test = ding->setText( querystring );
 
+                qDebug( querystring );
+                if ( ding->isCaseSensitive )
+                        qDebug( "ist CS");
+                else qDebug( "kein CS" );
+
                 browser_top->setText( test.top );
                 browser_bottom->setText( test.bottom );
         }
 }
 
-
-void ODict::slotSetErrorcount( int count )
-{
-        errorTol = count;
-}
-
 void ODict::slotSettings()
 {
         ConfigDlg dlg( this, "Config" , true);
         if ( dlg.exec() == QDialog::Accepted )
-        {
-                dlg.writeEntries();
-                loadConfig();
-        }
+                saveConfig();
 }
 
 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" );
+        saveConfig();
 }
 
 void ODict::slotMethodChanged( const QString& methodnumber )
 {
         activated_name =  methodnumber;
         
-        if ( activated_name != ding->loadedDict() )
-                ding->loadDict(activated_name);
+        qDebug( "activated_name in slotMethodChanged() ist:" );
+        qDebug( activated_name );
         
-        top_name->setText(  ding->lang1_name );
-        top_name->setAlignment( AlignHCenter );
-        bottom_name->setText( ding->lang2_name );
-        bottom_name->setAlignment( AlignHCenter );
+        //X if ( activated_name != ding->loadedDict() )
+        {
+                ding->loadDict(activated_name);
+                
+                lookupLanguageNames( activated_name );
+                top_name->setText( top_name_content );
+                bottom_name->setText( bottom_name_content );
+        }
 }
 
 void ODict::setupMenus()
 {
         menu = new QMenuBar( this );
         
         settings = new QPopupMenu( menu );
         setting_a = new QAction(tr( "Configuration" ), Resource::loadPixmap( "new" ), 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( "edit" ), 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 );
         
         menu->insertItem( tr( "Settings" ) , settings );
         menu->insertItem( tr( "Parameter" ) , parameter );
 }
diff --git a/noncore/apps/odict/odict.h b/noncore/apps/odict/odict.h
index b9a0778..9c037ea 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -15,54 +15,56 @@ class QPopupMenu;
 class QMenuBar;
 class QHBox;
 class QPushButton;
 class QLineEdit;
 class QAction;
 class QVBoxLayout;
 class QActionGroup;
 class DingWidget;
 class QTextBrowser;
 class QComboBox;
 class DingWidget;
 
 class ODict : public QMainWindow
 {
         Q_OBJECT
         
     public:
                 ODict();
                 QVBox *vbox;
                 QTextBrowser *browser_top,
                                          *browser_bottom;
                 DingWidget *ding;
 
         private:
-                QPopupMenu *help, *settings, *parameter, *error_tol_menu;
+                QPopupMenu *help, *settings, *parameter;
                 QMenuBar *menu;
                 QHBox *hbox;
                 QLineEdit *query_le;
                 QComboBox *query_co;
                 QPushButton *ok_button;
 
                 QVBoxLayout *vbox_layout;
 
                 QAction *setting_a, *setting_b;
                 
                 void setupMenus();
 
-                int errorTol;
                 bool casesens, completewords, regexp;
                 
                 void loadConfig();
                 void saveConfig();
 
                 QString activated_name;
                 QLabel  *bottom_name,
                                 *top_name;
+
+                QString top_name_content, bottom_name_content;
+
+                void lookupLanguageNames( QString );
         
         private slots:
                 void slotStartQuery();
-                void slotSetErrorcount( int );
                 void slotSettings();
                 void slotSetParameter( int );
                 void slotMethodChanged( const QString& );
 };
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index 8a14703..99cd8db 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -70,39 +70,39 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
         
         if( !itemname )
                 setCaption( tr( "New Searchmethod" ) );
         else 
         {
                 setCaption( tr( "Change Searchmethod" ) );
                 itemName = itemname;
                 setupEntries(itemname);
         }
 }
 
 void SearchMethodDlg::setupEntries( QString item )
 {
         Config cfg(  "odict" );
         cfg.setGroup( "Method_"+itemName );
         trenner->setText( cfg.readEntry( "Seperator" ) );
         lang1->setText( cfg.readEntry( "Lang1" ) );
         lang2->setText( cfg.readEntry( "Lang2" ) );
         nameLE->setText( itemName );
         dictFileLE->setText( cfg.readEntry( "file" ) );
 }
 
 void SearchMethodDlg::slotBrowse()
 {
-        itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath());
+        itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,QDir::homeDirPath());
         dictFileLE->setText( itemName );
 }
 
 void SearchMethodDlg::saveItem()
 {
         QString name = nameLE->text();
         Config cfg(  "odict" );
         cfg.setGroup( "Method_"+name );
         cfg.writeEntry( "Name", name );
         cfg.writeEntry( "Seperator", trenner->text() );
         cfg.writeEntry( "Lang1", lang1->text() );
         cfg.writeEntry( "Lang2", lang2->text() );
         cfg.writeEntry( "file", dictFileLE->text() );
 }
diff --git a/noncore/apps/odict/searchmethoddlg.h b/noncore/apps/odict/searchmethoddlg.h
index d98842f..706bbc1 100644
--- a/noncore/apps/odict/searchmethoddlg.h
+++ b/noncore/apps/odict/searchmethoddlg.h
@@ -1,40 +1,39 @@
 /***************************************************************************
  *                                                                         *
  * 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.                                   *
  *                                                                         *
  **************************************************************************/
 
 class QWidget;
 class QLineEdit;
 class OTabWidget;
 class QListView;
 class QPushButton;
 class QLabel;
 class QString;
 
 #include <qdialog.h>
 
-
 class SearchMethodDlg : public QDialog
 {
         Q_OBJECT
         
     public:
                 SearchMethodDlg(QWidget *parent, const char *name, bool modal=FALSE, QString itemname=0  );
 
                 QString itemName;
                 QLineEdit *nameLE;
                 QLineEdit *lang1, *lang2, *trenner;
                 void saveItem();
 
         private:
                 QLineEdit *dictFileLE;
                 void setupEntries( QString );
 
         private slots:
                 void slotBrowse();
 
 };