fix a stupid bug

3 files changed, 8 insertions, 10 deletions

diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 55a716d..c804385 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -1,132 +1,135 @@
 /***************************************************************************
    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 <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 
 DingWidget::DingWidget( )
 {
 	methodname = QString::null;
 	trenner = QString::null;
 	lines = 0L;
 }
 
 void DingWidget::loadDict( QString name )
 {
 	lines.clear(); //as we will load a new list we have to
 	               //remove the old one
-	qDebug( "DingWidget::loadDict( ... )" );
 	
 	Config cfg(  "odict" );
 	cfg.setGroup( "Method_" + name );
 	QFile file( cfg.readEntry( "file" )  );
 
 	if(  file.open(  IO_ReadOnly ) )
 	{
 		QTextStream stream(  &file );
 		while ( !stream.eof() )
 		{
 			lines.append(  stream.readLine() );
 		}
 		file.close();
 	}
+
+	setDict( name );
+
 	loadValues();
 }
 
 QString DingWidget::loadedDict() const
 { 
 	return dictName;
 }
 
 void DingWidget::setCaseSensitive( bool caseS )
 {
 	isCaseSensitive = caseS;
 }
 
 void DingWidget::setDict( QString dict )
 {
 	methodname = dict;
 }
 
 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()
 {
 	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
+		else if( right.contains( queryword , isCaseSensitive ) )
 		{
 			right.replace( queryword, substitute );
 			right = right + " --> " + left;
 			bottomlist.append( right );
 		}
 	}
 
 	s_strings.top = toplist.join( "<br>" );
 	s_strings.bottom = bottomlist.join( "<br>" );
 	
 	return s_strings;
 }
 
diff --git a/noncore/apps/odict/dingwidget.h b/noncore/apps/odict/dingwidget.h
index dbb55e2..9163a43 100644
--- a/noncore/apps/odict/dingwidget.h
+++ b/noncore/apps/odict/dingwidget.h
@@ -1,50 +1,49 @@
 /***************************************************************************
  *                                                                         *
  * 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() const;
 		void setQueryWord( QString );
 		void setDict( QString );
 		void loadValues();
 		
 		QString lang1_name,
 				lang2_name;
 
 		bool isCaseSensitive;
+
 	private:
 		BroswerContent parseInfo();
 
 		BroswerContent s_strings;
-		bool isCompleteWord;
 
 		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 c1de6ac..2028701 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -1,234 +1,230 @@
 /***************************************************************************
    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 <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>
 #include <qpe/config.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" );
 	casesens = cfg.readEntry( "casesens" ).toInt();
 	regexp = cfg.readEntry( "regexp" ).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 );
 		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++;
 	}
 	/*
 	 * now set the two names of the dictionary and the correct QComboBox-Entry
 	 */
 
 	lookupLanguageNames( lastname );
 	ding->loadDict( lastname );
+	ding->loadValues();
 
 	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( "casesens" , casesens );
 	cfg.writeEntry( "regexp" , regexp );
 	cfg.writeEntry( "lastdict" , query_co->currentText() );
 }
 
 void ODict::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
 						1 ) )   // Cancel choosen
 			{ 
 				case 0:
 					slotSettings();
 					break;
 				case 1: // stop here
 					return;
 			}
 		}				
 
 		/*
 		 * ok, the user has defined a dict
 		 */
 		ding->setCaseSensitive( casesens ); 
 
 		BroswerContent test = ding->setText( querystring );
 
 		browser_top->setText( test.top );
 		browser_bottom->setText( test.bottom );
 	}
 }
 
 void ODict::slotSettings()
 {
 	ConfigDlg dlg( this, "Config" , true);
 	if ( dlg.exec() == QDialog::Accepted )
 		saveConfig();
 }
 
 void ODict::slotSetParameter( int count )
 {
  	if ( count == 0 )
 	{
 		if ( casesens )
 			casesens = false;
 		else
 			casesens = true;
 	}
 
  	if ( count == 1 )
 	{
 		if ( regexp )
 			regexp = false;
 		else
 			regexp = true;
 	}
 	saveConfig();
 }
 
 void ODict::slotMethodChanged( const QString& methodnumber )
 {
 	activated_name =  methodnumber;
 	
-	qDebug( "activated_name in slotMethodChanged() ist:" );
-	qDebug( activated_name );
-	qDebug( ding->loadedDict() );
-	
 	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( "Allow &reg. expressions" ), 2 );
 	parameter->insertSeparator();
 	
 	menu->insertItem( tr( "Settings" ) , settings );
 	menu->insertItem( tr( "Parameter" ) , parameter );
 }