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

5 files changed, 31 insertions, 14 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
@@ -68,7 +68,7 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 
 void ConfigDlg::writeEntries()
 {
-	qDebug( "richtig beendet" );
+	//XXX wozu gibt es diese Methode?
 }
 		
 void ConfigDlg::slotNewMethod()
@@ -76,12 +76,10 @@ 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()
@@ -91,14 +89,11 @@ void ConfigDlg::slotChangeMethod()
 		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()
@@ -112,7 +107,6 @@ void ConfigDlg::slotDeleteMethod()
 		
 		list->takeItem( list->selectedItem() );
 	}
-	else qDebug("no item selected"); 
 }
 
 void ConfigDlg::loadSearchMethodNames()
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
@@ -89,6 +89,8 @@ void DingWidget::loadValues()
 	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 )
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
@@ -31,6 +31,9 @@ class DingWidget
 		void setDict( QString );
 		void loadValues();
 
+		QString lang1_name,
+				lang2_name;
+
 	private:
 		BroswerContent parseInfo();
 
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
@@ -46,13 +46,16 @@ ODict::ODict() : QMainWindow()
 	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();
@@ -78,7 +81,7 @@ void ODict::loadConfig()
 		cfg.setGroup( *it );
 		query_co->insertItem( cfg.readEntry( "Name" ) );
 	}
-	slotMethodChanged( 1 );           //FIXME: this line should not contain a integer
+//XXX	slotMethodChanged( "1" );           //FIXME: this line should not contain a integer
 }
 
 
@@ -94,6 +97,8 @@ void ODict::saveConfig()
 
 void ODict::slotStartQuery()
 {
+	if ( !query_le->text( ).isEmpty() )
+	{
 	/*
 	 * if the user has not yet defined a dictionary
 	 */
@@ -122,6 +127,8 @@ void ODict::slotStartQuery()
 	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);
@@ -131,6 +138,7 @@ void ODict::slotStartQuery()
 	browser_top->setText( test.top );
 	browser_bottom->setText( test.bottom );
 }
+}
 
 
 void ODict::slotSetErrorcount( int count )
@@ -146,7 +154,6 @@ void ODict::slotSettings()
 		dlg.writeEntries();
 		loadConfig();
 	}
-	else qDebug( "abgebrochen" );
 }
 
 void ODict::slotSetParameter( int count )
@@ -176,9 +183,17 @@ void ODict::slotSetParameter( int count )
  	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()
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
@@ -9,6 +9,7 @@
 
 #include <qmainwindow.h>
 
+class QLabel;
 class QVBox;
 class QPopupMenu;
 class QMenuBar;
@@ -55,11 +56,13 @@ class ODict : public QMainWindow
 		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& );
 };