author | harlekin <harlekin> | 2004-06-20 13:19:19 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-06-20 13:19:19 (UTC) |
commit | 9f4c73fe369f2a8052323c2b1ae21f3ce133b9fd (patch) (unidiff) | |
tree | e5e0e4eb966be59ef350ac92710682857b006e15 | |
parent | 3d49080501c6619f9bb323be9935d28f4458530f (diff) | |
download | opie-9f4c73fe369f2a8052323c2b1ae21f3ce133b9fd.zip opie-9f4c73fe369f2a8052323c2b1ae21f3ce133b9fd.tar.gz opie-9f4c73fe369f2a8052323c2b1ae21f3ce133b9fd.tar.bz2 |
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
-rw-r--r-- | noncore/apps/odict/configdlg.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 4 |
2 files changed, 8 insertions, 5 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 | |||
@@ -51,5 +51,5 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa | |||
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 | ||
@@ -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 | ||