From 9f4c73fe369f2a8052323c2b1ae21f3ce133b9fd Mon Sep 17 00:00:00 2001
From: harlekin <harlekin>
Date: Sun, 20 Jun 2004 13:19:19 +0000
Subject: BUGFIX: 0001325 - no double dialog start in odict, when using QDialog::exec  don't use  it together  with QPEApplication::execDialog() but with QPEApplication::showDialog(), also fixed another bug where shadow entries where created after deletion of entries

---
(limited to 'noncore')

diff --git a/noncore/apps/odict/configdlg.cpp b/noncore/apps/odict/configdlg.cpp
index 7fa6008..3d98f63 100644
--- a/noncore/apps/odict/configdlg.cpp
+++ b/noncore/apps/odict/configdlg.cpp
@@ -37,7 +37,7 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 	list = new QListView( hbox );
 	list->addColumn( tr( "Searchmethod" ) );
 	loadSearchMethodNames();
-	
+
 	QVBox *vbox = new QVBox( hbox );
 	new_button = new QPushButton( tr( "New" ) , vbox );
 	change_button = new QPushButton( tr( "Change" ) , vbox );
@@ -45,12 +45,12 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
 	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 );
 
 	vbox_layout->addWidget( search_tab );
 
-	QPEApplication::execDialog( this );
+ 	QPEApplication::showDialog( this );
 }
 
 void ConfigDlg::slotNewMethod()
@@ -86,7 +86,7 @@ void ConfigDlg::slotDeleteMethod()
 		cfg.setGroup( "Method_"+list->selectedItem()->text(0) );
 		cfg.clearGroup();
 		//FIXME: this only removes the entries but not the group itself
-		
+
 		list->takeItem( list->selectedItem() );
 	}
 }
@@ -97,8 +97,11 @@ void ConfigDlg::loadSearchMethodNames()
 	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" ) );
+		QString name = cfg.readEntry( "Name" );
+		if ( name != QString::null ) {
+			QListViewItem *item = new QListViewItem( list );
+			item->setText( 0 , name );
+		}
 	}
 }
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index 34e8b16..0425657 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -66,8 +66,6 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
 
 	vbox_layout->addWidget( vbox );
 
-	QPEApplication::execDialog ( this );
-
 	if( !itemname )
 		setCaption( tr( "New Searchmethod" ) );
 	else
@@ -76,6 +74,8 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
 		itemName = itemname;
 		setupEntries(itemname);
 	}
+
+ 	QPEApplication::showDialog ( this );
 }
 
 void SearchMethodDlg::setupEntries( QString item )
--
cgit v0.9.0.2