3 files changed, 13 insertions, 23 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 5b5d731..cfef84d 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -1,185 +1,179 @@
 /***************************************************************************
   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;
+        trenner = QString::null;
        lines = 0L;
-        loadValues();
-        //X qDebug( topbrowser );
-        //X qDebug( top );
-//X 
-        //X topbrowser = "blahbalh";
-        //X 
-        //X qDebug( topbrowser );
-        //X qDebug( top );
 }
 void DingWidget::loadDict( QString name )
 {
        qDebug( "MUSS ich wirklich aufgerufen werder? schreit loadDict" );
        qDebug( "Starte mit dem loadedDict(...)" );
        dictName = name;
        qDebug( "bin in loadedDict() und lade das Dict:" );
        qDebug( dictName );
          QString opie_dir = getenv("OPIEDIR");
        QFile file( opie_dir+"/noncore/apps/odict/eng_ita.dic" );
        //FIXME:this should of course be not hardcoded ;)
        
        if(  file.open(  IO_ReadOnly ) )
        {
                QTextStream stream(  &file );
                while ( !stream.eof() )
                {
                        lines.append(  stream.readLine() );
                }
                file.close();
        }
        qDebug( "loadedDict(...) ist beended" );
+        loadValues();
 }
 QString DingWidget::loadedDict()
 { 
        qDebug( dictName );
        qDebug( "^ ^ ^ ^ ^ ^ ^ war der dictName" );
        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;
 }
 BroswerContent DingWidget::setText( QString word )
 {
        queryword = word;
        qDebug( queryword );
        qDebug( "^ ^ ^ ^ ^ ^ ^ war das gesuchte Word");
        return parseInfo();
 }
 void DingWidget::loadValues()
 {
        Config cfg(  "odict" );
-        cfg.setGroup( "Method_"+methodname );
+        cfg.setGroup( "Method_" + methodname );
-        //trenner = cfg.readEntry( "Seperator" );
+        trenner = cfg.readEntry( "Seperator" );
 }
 BroswerContent DingWidget::parseInfo()
 {
+        if ( isCompleteWord ) queryword = " " + queryword + " ";
        QStringList search = lines.grep( queryword , isCaseSensitive );
         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( trenner );
        QRegExp reg_word( queryword );
        reg_word.setCaseSensitive( isCaseSensitive );
        QStringList toplist, bottomlist;
        QString substitute = "<strong>"+queryword+"</strong>";
        /*             Dieser Block ist von Patrik. Ich versuche einen neuen
         *             Ansatz. Zum einen ist HTML schei�e an dieser Stelle und 
         *             zum andern funktioniert der Code nicht so wie er sollte.
        QString substitute = "<a href=''>"+queryword+"</a>";
+        
+        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>";
         
        for( QStringList::Iterator it = search.begin() ; it != search.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
        s_strings.bottom = html_header + bottomlist.join( "<br>" ) + html_footer;
        s_strings.top    = html_header + toplist.join( "<br>" )    + html_footer;
        */
        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) -2 );
                if ( left.contains( queryword , isCaseSensitive ) )
                {
                        left.replace( queryword, substitute );
                        left = left + "-->" + right;
                        toplist.append( left );
                }
                else
                {
                        right.replace( queryword, substitute );
                        left = right + "-->" + left;
                        bottomlist.append( right );
                }
        }
        s_strings.bottom = bottomlist.join( "\n" );
        s_strings.top = toplist.join( "\n" );
        return s_strings;
 }
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index ba37009..74f40c9 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -1,47 +1,47 @@
 /***************************************************************************
 *                                                                         *
 * 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 <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();
                void setQueryWord( QString );
                void setDict( QString );
+                void loadValues();
        private:
                BroswerContent parseInfo();
                BroswerContent s_strings;
                bool isCompleteWord;
                bool isCaseSensitive;
                QString dictName;
                
                QString search_word;
-                void loadValues();
                QString queryword;
                QString methodname;
                QString trenner;
 };
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index 42604ee..78c3f90 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -1,219 +1,215 @@
 /***************************************************************************
   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 );
        ding = new DingWidget();
+        ding->loadValues();
        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_" );
        query_co->clear();
        for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
        {
                cfg.setGroup( *it );
                query_co->insertItem( cfg.readEntry( "Name" ) );
        }
        slotMethodChanged(1 );           //FIXME: this line should not contain a integer
 }
 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 20030111" ) );
 }
 void ODict::slotStartQuery()
 {
        QString querystring = query_le->text();
        //X qDebug("opening dict >%s< for >%s<", activated_name.latin1(),querystring.latin1());
        //X if (querystring.isEmpty()){
        //X     qWarning("empty querystring");
        //X     return;
        //X }
        //X if (!activated_name || activated_name.isEmpty())
        //X     QMessageBox::warning(this,tr("No Dictionary"),tr("Please choose a dictonary") );
        //X else
        //X {
-                if ( casesens ) qDebug( "casesens = TRUE" );
-                else qDebug( "casesens = FALSE" );
-                
                ding->setCaseSensitive( casesens ); 
                ding->setCompleteWord( completewords ); 
                ding->setDict( activated_name );
                
                if ( activated_name != ding->loadedDict() )
                {
-                        qDebug( "ComboBox ge�ndert" );
                        ding->loadDict(activated_name);
                }
-                else qDebug( "ComboBox war GLEICH" );
                
                BroswerContent test = ding->setText( querystring );
                browser_top->setText( test.top );
                browser_bottom->setText( test.bottom );
                
                qDebug( "Text sollte gesetzt sein..." );
        //X }
 }
 void ODict::slotSetErrorcount( int count )
 {
        errorTol = count;
 }
 void ODict::slotSettings()
 {
        ConfigDlg dlg( this, "Config" , true);
        if ( dlg.exec() == QDialog::Accepted )
        {
                dlg.writeEntries();
                loadConfig();
        }
        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 );
 }