author | cniehaus <cniehaus> | 2002-12-29 16:52:47 (UTC) |
---|---|---|
committer | cniehaus <cniehaus> | 2002-12-29 16:52:47 (UTC) |
commit | f9308849c8257f3d2e4bec0d476f56f87935cdab (patch) (unidiff) | |
tree | 1854eaf7b0ea1f2a23a974b2eab8616eb4db76f4 | |
parent | 95e2d570a5f7dd3611858a55ac7956ab7ece6f3d (diff) | |
download | opie-f9308849c8257f3d2e4bec0d476f56f87935cdab.zip opie-f9308849c8257f3d2e4bec0d476f56f87935cdab.tar.gz opie-f9308849c8257f3d2e4bec0d476f56f87935cdab.tar.bz2 |
and now without segfault on exit
-rw-r--r-- | noncore/apps/odict/searchmethoddlg.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp index 0572f11..fcbdb8a 100644 --- a/noncore/apps/odict/searchmethoddlg.cpp +++ b/noncore/apps/odict/searchmethoddlg.cpp | |||
@@ -27,24 +27,16 @@ | |||
27 | #include <qstring.h> | 27 | #include <qstring.h> |
28 | #include <qlineedit.h> | 28 | #include <qlineedit.h> |
29 | 29 | ||
30 | #include <opie/ofileselector.h> | 30 | #include <opie/ofileselector.h> |
31 | #include <opie/ofiledialog.h> | 31 | #include <opie/ofiledialog.h> |
32 | 32 | ||
33 | SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal) | 33 | SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal) |
34 | { | 34 | { |
35 | if( !itemname ) | ||
36 | setCaption( tr( "New Searchmethod" ) ); | ||
37 | else | ||
38 | { | ||
39 | setCaption( tr( "Change Searchmethod" ) ); | ||
40 | itemName = itemname; | ||
41 | setupEntries(itemname); | ||
42 | } | ||
43 | 35 | ||
44 | QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" ); | 36 | QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" ); |
45 | QVBox *vbox = new QVBox( this ); | 37 | QVBox *vbox = new QVBox( this ); |
46 | 38 | ||
47 | QHBox *hbox1 = new QHBox( vbox ); | 39 | QHBox *hbox1 = new QHBox( vbox ); |
48 | QLabel *nameLabel = new QLabel( tr( "Name:" ) , hbox1 ); | 40 | QLabel *nameLabel = new QLabel( tr( "Name:" ) , hbox1 ); |
49 | nameLE = new QLineEdit( hbox1 ); | 41 | nameLE = new QLineEdit( hbox1 ); |
50 | 42 | ||
@@ -69,28 +61,36 @@ SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, | |||
69 | grid->addWidget( lag2, 0,2 ); | 61 | grid->addWidget( lag2, 0,2 ); |
70 | grid->addWidget( lang1, 1,0 ); | 62 | grid->addWidget( lang1, 1,0 ); |
71 | grid->addWidget( trenner, 1,1 ); | 63 | grid->addWidget( trenner, 1,1 ); |
72 | grid->addWidget( lang2, 1,2 ); | 64 | grid->addWidget( lang2, 1,2 ); |
73 | 65 | ||
74 | vbox_layout->addWidget( vbox ); | 66 | vbox_layout->addWidget( vbox ); |
75 | 67 | ||
76 | showMaximized(); | 68 | showMaximized(); |
69 | |||
70 | if( !itemname ) | ||
71 | setCaption( tr( "New Searchmethod" ) ); | ||
72 | else | ||
73 | { | ||
74 | setCaption( tr( "Change Searchmethod" ) ); | ||
75 | itemName = itemname; | ||
76 | setupEntries(itemname); | ||
77 | } | ||
77 | } | 78 | } |
78 | 79 | ||
79 | void SearchMethodDlg::setupEntries( QString item ) | 80 | void SearchMethodDlg::setupEntries( QString item ) |
80 | { | 81 | { |
81 | Config cfg( "odict" ); | 82 | Config cfg( "odict" ); |
82 | cfg.setGroup( itemName ); | 83 | cfg.setGroup( itemName ); |
83 | trenner->setText( "foooof" ); | 84 | trenner->setText( cfg.readEntry( "Seperator" ) ); |
84 | //X trenner->setText( cfg.readEntry( "Seperator" ) ); | 85 | lang1->setText( cfg.readEntry( "Lang1" ) ); |
85 | //X lang1->setText( cfg.readEntry( "Lang1" ) ); | 86 | lang2->setText( cfg.readEntry( "Lang2" ) ); |
86 | //X lang2->setText( cfg.readEntry( "Lang2" ) ); | 87 | nameLE->setText( itemName ); |
87 | //X nameLE->setText( itemName ); | 88 | dictFileLE->setText( cfg.readEntry( "file" ) ); |
88 | //X dictFileLE->setText( cfg.readEntry( "file" ) ); | ||
89 | } | 89 | } |
90 | 90 | ||
91 | void SearchMethodDlg::slotBrowse() | 91 | void SearchMethodDlg::slotBrowse() |
92 | { | 92 | { |
93 | itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,"/home/carsten" ); | 93 | itemName=OFileDialog::getOpenFileName( OFileSelector::EXTENDED,"/home/carsten" ); |
94 | dictFileLE->setText( itemName ); | 94 | dictFileLE->setText( itemName ); |
95 | } | 95 | } |
96 | 96 | ||