-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 15 | ||||
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 4 |
2 files changed, 11 insertions, 8 deletions
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 @@ -36,22 +36,22 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa QHBox *hbox = new QHBox( search_tab ); 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 ); delete_button = new QPushButton( tr( "Delete" ) , vbox ); 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() { @@ -85,9 +85,9 @@ void ConfigDlg::slotDeleteMethod() Config cfg ( "odict" ); cfg.setGroup( "Method_"+list->selectedItem()->text(0) ); cfg.clearGroup(); //FIXME: this only removes the entries but not the group itself - + list->takeItem( list->selectedItem() ); } } @@ -96,9 +96,12 @@ void ConfigDlg::loadSearchMethodNames() Config cfg( "odict" ); 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 @@ -65,18 +65,18 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, grid->addWidget( lang2, 1,2 ); vbox_layout->addWidget( vbox ); - QPEApplication::execDialog ( this ); - if( !itemname ) setCaption( tr( "New Searchmethod" ) ); else { setCaption( tr( "Change Searchmethod" ) ); itemName = itemname; setupEntries(itemname); } + + QPEApplication::showDialog ( this ); } void SearchMethodDlg::setupEntries( QString item ) { |