265 lines diff :) mostly markupstuff. But also one bug less

5 files changed, 67 insertions, 50 deletions

diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index eba7dec..1608486 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -23,106 +23,100 @@
 
 #include <qhbox.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qlistview.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qstringlist.h>
 
 #include <opie/otabwidget.h>
 
 ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(parent, name, modal)
 {
         setCaption( tr( "Options" ) );
         QVBoxLayout *vbox_layout = new QVBoxLayout( this );
         tab = new OTabWidget( this, "OTabWidget_tab", OTabWidget::Global, OTabWidget::Bottom );
         vbox_layout->addWidget( tab );
 
         /*general settings*/
         settings_tab = new QWidget( tab , "settings_tab" );
 
         /*searchmethods*/
         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()
 {
-        qDebug( "richtig beendet" );
+        //XXX wozu gibt es diese Methode?
 }
                 
 void ConfigDlg::slotNewMethod()
 {
         SearchMethodDlg dlg( this, "SearchMethodDlg", true );
         if ( dlg.exec() == QDialog::Accepted )
         {
-                //if ( !dlg.nameLE->text() ) return; //XXX
                 dlg.saveItem();
                 QListViewItem *item = new QListViewItem( list );
                 item->setText( 0 , dlg.nameLE->text() );
         }
-        else qDebug( "SearchMethodDlg abgebrochen" );
 }
 
 void ConfigDlg::slotChangeMethod()
 {
         if ( list->selectedItem() )
         {
                 SearchMethodDlg dlg( this, "SearchMethodDlg", true, list->selectedItem()->text( 0 ) );
                 if ( dlg.exec() == QDialog::Accepted )
                 {
-                        //if ( !dlg.nameLE->text() ) return; //XXX geht vielleich nicht
                         dlg.saveItem();
                         QListViewItem *item = list->selectedItem();
                         item->setText( 0 , dlg.nameLE->text() );
                 }
-                else qDebug( "SearchMethodDlg abgebrochen" );
         }
-        else qDebug( "kein item angewählt" );
 }
 
 void ConfigDlg::slotDeleteMethod()
 {
         if ( list->selectedItem() )
         {
                 Config cfg ( "odict" );
                 cfg.setGroup( "Method_"+list->selectedItem()->text(0) );
                 cfg.clearGroup();
                 //FIXME: this only removes the entries but not the group itself
                 
                 list->takeItem( list->selectedItem() );
         }
-        else qDebug("no item selected"); 
 }
 
 void ConfigDlg::loadSearchMethodNames()
 {
         Config cfg(  "odict" );
         QStringList groupListCfg = cfg.groupList().grep( "Method_" );
         for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it )
         {
                 QListViewItem *item = new QListViewItem( list );
                 cfg.setGroup( *it );
                 item->setText( 0 , cfg.readEntry( "Name" ) );
         }
 }
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index abb5e75..0707bfb 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -44,96 +44,98 @@ void DingWidget::loadDict( QString name )
         if ( !methodname ) return;
         cfg.setGroup( "Method_" + methodname );
         QFile file( cfg.readEntry( "file" )  );
         
         if(  file.open(  IO_ReadOnly ) )
         {
                 QTextStream stream(  &file );
                 while ( !stream.eof() )
                 {
                         lines.append(  stream.readLine() );
                 }
                 file.close();
         }
         loadValues();
 }
 
 QString DingWidget::loadedDict()
 { 
         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()
 {
         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;
                         toplist.append( left );
                 }
                 else
                 {
                         right.replace( queryword, substitute );
                         right = right + " --> " + left;
                         bottomlist.append( right );
                 }
         }
 
         s_strings.top = toplist.join( "<br>" );
         s_strings.bottom = bottomlist.join( "<br>" );
 
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index 74f40c9..d8466cb 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -1,47 +1,50 @@
 /***************************************************************************
  *                                                                         *
  * 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();
+                
+                QString lang1_name,
+                                lang2_name;
 
         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 9f9a8d9..cb9c4e0 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -1,214 +1,229 @@
 /***************************************************************************
    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();
+        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) ) );
+        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 );
         browser_top = new QTextBrowser( vbox );
+        bottom_name = new QLabel( 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
+        //XXXslotMethodChanged( "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::slotStartQuery()
 {
-        /*
-         * if the user has not yet defined a dictionary
-         */
-        if ( !query_co->currentText() )
+        if ( !query_le->text( ).isEmpty() )
         {
-                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 ); 
-        ding->setDict( activated_name );
-
-        if ( activated_name != ding->loadedDict() )
-                ding->loadDict(activated_name);
-
-        BroswerContent test = ding->setText( querystring );
-
-        browser_top->setText( test.top );
-        browser_bottom->setText( test.bottom );
+                /*
+                 * 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 ); 
+                ding->setDict( activated_name );
+                top_name->setText(  ding->lang1_name );
+                bottom_name->setText( ding->lang2_name );
+
+                if ( activated_name != ding->loadedDict() )
+                        ding->loadDict(activated_name);
+
+                BroswerContent test = ding->setText( querystring );
+
+                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();
         }
-        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*/ )
+void ODict::slotMethodChanged( const QString& methodnumber )
 {
-        activated_name = query_co->currentText();
+        activated_name =  methodnumber;
+        
+        if ( activated_name != ding->loadedDict() )
+                ding->loadDict(activated_name);
+        
+        top_name->setText(  ding->lang1_name );
+        top_name->setAlignment( AlignHCenter );
+        bottom_name->setText( ding->lang2_name );
+        bottom_name->setAlignment( AlignHCenter );
 }
 
 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 3065feb..b9a0778 100644
--- a/noncore/apps/odict/odict.h
+++ b/noncore/apps/odict/odict.h
@@ -1,65 +1,68 @@
 /***************************************************************************
  *                                                                         *
  * 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 QLabel;
 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 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;
                 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;
         
         private slots:
                 void slotStartQuery();
                 void slotSetErrorcount( int );
                 void slotSettings();
                 void slotSetParameter( int );
-                void slotMethodChanged( int );
+                void slotMethodChanged( const QString& );
 };