summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-06-20 13:19:19 (UTC)
committer harlekin <harlekin>2004-06-20 13:19:19 (UTC)
commit9f4c73fe369f2a8052323c2b1ae21f3ce133b9fd (patch) (unidiff)
treee5e0e4eb966be59ef350ac92710682857b006e15
parent3d49080501c6619f9bb323be9935d28f4458530f (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/odict/configdlg.cpp15
-rw-r--r--noncore/apps/odict/searchmethoddlg.cpp4
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
@@ -39,3 +39,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
39 loadSearchMethodNames(); 39 loadSearchMethodNames();
40 40
41 QVBox *vbox = new QVBox( hbox ); 41 QVBox *vbox = new QVBox( hbox );
@@ -47,3 +47,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
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 );
@@ -52,3 +52,3 @@ ConfigDlg::ConfigDlg(QWidget *parent, const char *name, bool modal) : QDialog(pa
52 52
53 QPEApplication::execDialog( this ); 53 QPEApplication::showDialog( this );
54} 54}
@@ -88,3 +88,3 @@ void ConfigDlg::slotDeleteMethod()
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() );
@@ -99,5 +99,8 @@ void ConfigDlg::loadSearchMethodNames()
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 }
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
@@ -68,4 +68,2 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
68 68
69 QPEApplication::execDialog ( this );
70
71 if( !itemname ) 69 if( !itemname )
@@ -78,2 +76,4 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal,
78 } 76 }
77
78 QPEApplication::showDialog ( this );
79} 79}