1 files changed, 2 insertions, 16 deletions

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
@@ -36,25 +36,24 @@
 
 #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();
         query_le = new QLineEdit( hbox );
         query_co = new QComboBox( hbox );
         connect( query_co , SIGNAL( activated(int) ), this, SLOT( slotMethodChanged(int) ) );
         ok_button = new QPushButton( tr( "&Ok" ), hbox );
         connect( ok_button, SIGNAL( released() ), this, SLOT( slotStartQuery() ) );
         browser_top = new QTextBrowser( vbox );
         browser_bottom = new QTextBrowser( vbox );
 
         ding = new DingWidget();
         ding->loadValues();
@@ -87,48 +86,35 @@ 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()
 {
         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 }
 }
 
 
 void ODict::slotSetErrorcount( int count )
 {
         errorTol = count;
 }
 
 void ODict::slotSettings()
 {
         ConfigDlg dlg( this, "Config" , true);
         if ( dlg.exec() == QDialog::Accepted )
@@ -167,28 +153,28 @@ void ODict::slotSetParameter( int count )
 }
 
 void ODict::slotMethodChanged( int /*methodnumber*/ )
 {
         activated_name = query_co->currentText();
 }
 
 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 );
         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 );