-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 | |||
@@ -38,5 +38,5 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa | |||
38 | list->addColumn( tr( "Searchmethod" ) ); | 38 | list->addColumn( tr( "Searchmethod" ) ); |
39 | loadSearchMethodNames(); | 39 | loadSearchMethodNames(); |
40 | 40 | ||
41 | QVBox *vbox = new QVBox( hbox ); | 41 | QVBox *vbox = new QVBox( hbox ); |
42 | new_button = new QPushButton( tr( "New" ) , vbox ); | 42 | new_button = new QPushButton( tr( "New" ) , vbox ); |
@@ -46,10 +46,10 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa | |||
46 | connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); | 46 | connect( change_button, SIGNAL( clicked() ), this, SLOT( slotChangeMethod() )); |
47 | connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); | 47 | connect( delete_button, SIGNAL( clicked() ), this, SLOT( slotDeleteMethod() )); |
48 | 48 | ||
49 | vbox_layout_searchtab->addWidget( hbox ); | 49 | vbox_layout_searchtab->addWidget( hbox ); |
50 | 50 | ||
51 | vbox_layout->addWidget( search_tab ); | 51 | vbox_layout->addWidget( search_tab ); |
52 | 52 | ||
53 | QPEApplication::execDialog( this ); | 53 | QPEApplication::showDialog( this ); |
54 | } | 54 | } |
55 | 55 | ||
@@ -87,5 +87,5 @@ void ConfigDlg::slotDeleteMethod() | |||
87 | cfg.clearGroup(); | 87 | cfg.clearGroup(); |
88 | //FIXME: this only removes the entries but not the group itself | 88 | //FIXME: this only removes the entries but not the group itself |
89 | 89 | ||
90 | list->takeItem( list->selectedItem() ); | 90 | list->takeItem( list->selectedItem() ); |
91 | } | 91 | } |
@@ -98,7 +98,10 @@ void ConfigDlg::loadSearchMethodNames() | |||
98 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) | 98 | for ( QStringList::Iterator it = groupListCfg.begin() ; it != groupListCfg.end() ; ++it ) |
99 | { | 99 | { |
100 | QListViewItem *item = new QListViewItem( list ); | ||
101 | cfg.setGroup( *it ); | 100 | cfg.setGroup( *it ); |
102 | item->setText( 0 , cfg.readEntry( "Name" ) ); | 101 | QString name = cfg.readEntry( "Name" ); |
102 | if ( name != QString::null ) { | ||
103 | QListViewItem *item = new QListViewItem( list ); | ||
104 | item->setText( 0 , name ); | ||
105 | } | ||
103 | } | 106 | } |
104 | } | 107 | } |
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 | |||
@@ -67,6 +67,4 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, | |||
67 | vbox_layout->addWidget( vbox ); | 67 | vbox_layout->addWidget( vbox ); |
68 | 68 | ||
69 | QPEApplication::execDialog ( this ); | ||
70 | |||
71 | if( !itemname ) | 69 | if( !itemname ) |
72 | setCaption( tr( "New Searchmethod" ) ); | 70 | setCaption( tr( "New Searchmethod" ) ); |
@@ -77,4 +75,6 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, | |||
77 | setupEntries(itemname); | 75 | setupEntries(itemname); |
78 | } | 76 | } |
77 | |||
78 | QPEApplication::showDialog ( this ); | ||
79 | } | 79 | } |
80 | 80 | ||