2 files changed, 14 insertions, 49 deletions
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index cfef84d..16164ed 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -9,49 +9,48 @@
 /***************************************************************************
 *                                                                         *
 * 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( "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() );
@@ -68,112 +67,82 @@ QString DingWidget::loadedDict()
        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;
 }
+void DingWidget::loadValues()
+{
+        Config cfg(  "odict" );
+        cfg.setGroup( "Method_" + methodname );
+        trenner = cfg.readEntry( "Seperator" );
+}
 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 );
-        trenner = cfg.readEntry( "Seperator" );
-}
 BroswerContent DingWidget::parseInfo()
 {
-        if ( isCompleteWord ) queryword = " " + queryword + " ";
+        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>";
-        /*             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 );
+                right = current.right( current.length() - current.find(trenner) - trenner.length() );
                if ( left.contains( queryword , isCaseSensitive ) )
                {
                        left.replace( queryword, substitute );
-                        left = left + "-->" + right;
+                        left = left + " -- " + right;
                        toplist.append( left );
                }
                else
                {
                        right.replace( queryword, substitute );
-                        left = right + "-->" + left;
+                        left = right + " -- " + left;
                        bottomlist.append( right );
                }
        }
-        s_strings.bottom = bottomlist.join( "\n" );
        s_strings.top = toplist.join( "\n" );
+        s_strings.bottom = bottomlist.join( "\n" );
        return s_strings;
 }
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index c4114f7..58cff5f 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -180,31 +180,27 @@ void ODict::setupMenus()
        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 );
 }