bugfix

3 files changed, 18 insertions, 30 deletions

diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 89bc6f6..eba7dec 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -73,12 +73,13 @@ void ConfigDlg::writeEntries()
 		
 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" );
 }
@@ -87,12 +88,13 @@ 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" );
 	}
diff --git a/noncore/apps/odict/dingwidget.cpp b/noncore/apps/odict/dingwidget.cpp
index 5c4b13b..abb5e75 100644
--- a/noncore/apps/odict/dingwidget.cpp
+++ b/noncore/apps/odict/dingwidget.cpp
@@ -25,27 +25,26 @@
 #include <qmainwindow.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 #include <qtextbrowser.h>
-#include <stdlib.h> // for getenv
+//#include <stdlib.h> // for getenv
 
 DingWidget::DingWidget( )
 {
 	methodname = QString::null;
 	trenner = QString::null;
 	lines = 0L;
 }
 
 void DingWidget::loadDict( QString name )
 {
 	dictName = name;
-  	QString opie_dir = getenv("OPIEDIR");
-	
 	Config cfg(  "odict" );
+	if ( !methodname ) return;
 	cfg.setGroup( "Method_" + methodname );
 	QFile file( cfg.readEntry( "file" )  );
 	
 	if(  file.open(  IO_ReadOnly ) )
 	{
 		QTextStream stream(  &file );
@@ -83,12 +82,13 @@ void DingWidget::setQueryWord( QString qword )
 	queryword = qword;
 }
 
 
 void DingWidget::loadValues()
 {
+	if ( !methodname ) return;
 	Config cfg(  "odict" );
 	cfg.setGroup( "Method_" + methodname );
 	trenner = cfg.readEntry( "Seperator" );
 }
 
 BroswerContent DingWidget::setText( QString word )
diff --git a/noncore/apps/odict/odict.cpp b/noncore/apps/odict/odict.cpp
index a404e89..cc3148a 100644
--- a/noncore/apps/odict/odict.cpp
+++ b/noncore/apps/odict/odict.cpp
@@ -41,13 +41,12 @@ 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) ) );
@@ -93,36 +92,23 @@ void ODict::saveConfig()
 	cfg.writeEntry( "completewords" , completewords );
 }
 
 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 	{
-
-		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 );
-		
-		qDebug( "Text sollte gesetzt sein..." );
-//X 	}
+	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 );
 }
 
 
 void ODict::slotSetErrorcount( int count )
 {
 	errorTol = count;
@@ -173,16 +159,16 @@ void ODict::slotMethodChanged( int /*methodnumber*/ )
 
 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 );
+	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(  "today/config" ), QString::null, 0, this, 0 );
+	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 );