author | ulf69 <ulf69> | 2004-08-06 20:34:07 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-06 20:34:07 (UTC) |
commit | 4cbb59835b52b524c9fcbb377159d91a97e1b626 (patch) (unidiff) | |
tree | b2b4fe7fa037b1d4395f71873f086e11ac97e80f /kaddressbook/kcmconfigs | |
parent | 26697d027609149853b984874190e2624749b7e3 (diff) | |
download | kdepimpi-4cbb59835b52b524c9fcbb377159d91a97e1b626.zip kdepimpi-4cbb59835b52b524c9fcbb377159d91a97e1b626.tar.gz kdepimpi-4cbb59835b52b524c9fcbb377159d91a97e1b626.tar.bz2 |
kcmultidialog can now handle the configuration of multiple applications at once
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.cpp | 110 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kabconfigwidget.h | 10 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 60 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.h | 50 |
4 files changed, 65 insertions, 165 deletions
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index 1bac26f..b5309c0 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp | |||
@@ -155,36 +155,2 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
155 | 155 | ||
156 | // mailclient page | ||
157 | QWidget *mailclientPage = new QWidget( this ); | ||
158 | layout = new QVBoxLayout( mailclientPage, KDialog::marginHintSmall(), | ||
159 | KDialog::spacingHintSmall() ); | ||
160 | |||
161 | groupBox = new QGroupBox( 0, Qt::Vertical, i18n( "Used Mail Client" ), mailclientPage ); | ||
162 | boxLayout = new QVBoxLayout( groupBox->layout() ); | ||
163 | boxLayout->setAlignment( Qt::AlignTop ); | ||
164 | // boxLayout->setMargin(KDialog::marginHintSmall() ); | ||
165 | // groupBox->layout()->setMargin(KDialog::marginHintSmall()) ; | ||
166 | // groupBox->layout()->setSpacing(KDialog::spacingHintSmall()); | ||
167 | // boxLayout->setSpacing( KDialog::spacingHintSmall() ); | ||
168 | |||
169 | mEmailClient = new QComboBox( groupBox ); | ||
170 | mEmailClient->insertItem( i18n("OM/Pi"), KABPrefs::OMPI ); | ||
171 | mEmailClient->insertItem( i18n("Qtopia mail"), KABPrefs::QTOPIA ); | ||
172 | mEmailClient->insertItem( i18n("Opie mail"), KABPrefs::OPIE ); | ||
173 | mEmailClient->insertItem( i18n("Other"), KABPrefs::OTHER ); | ||
174 | boxLayout->addWidget( mEmailClient ); | ||
175 | |||
176 | connect( mEmailClient, SIGNAL( activated( int ) ), | ||
177 | this, SLOT (emailclient_changed( int ) ) ); | ||
178 | |||
179 | QLabel* lab = new QLabel( i18n("Channel:"), groupBox); | ||
180 | boxLayout->addWidget( lab ); | ||
181 | mEmailChannel = new QLineEdit(groupBox); | ||
182 | mEmailChannel->setReadOnly(true); | ||
183 | boxLayout->addWidget( mEmailChannel ); | ||
184 | |||
185 | layout->addWidget( groupBox ); | ||
186 | tabWidget->addTab( mailclientPage, i18n( "Mail" ) ); | ||
187 | |||
188 | |||
189 | |||
190 | } | 156 | } |
@@ -192,56 +158,6 @@ KABConfigWidget::KABConfigWidget( QWidget *parent, const char *name ) | |||
192 | 158 | ||
193 | 159 | void KABConfigWidget::restoreSettings(KABPrefs* prefs) | |
194 | void KABConfigWidget::emailclient_changed( int newClient ) | ||
195 | { | 160 | { |
196 | if (newClient == KABPrefs::OTHER) | 161 | //US prefs was KABPrefs::instance() before |
197 | mEmailChannel->setReadOnly(false); | ||
198 | else | ||
199 | mEmailChannel->setReadOnly(true); | ||
200 | |||
201 | QString opiepath = QString::fromLatin1( getenv("OPIEDIR") ); | ||
202 | QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") ); | ||
203 | |||
204 | if (opiepath.isEmpty()) | ||
205 | opiepath = qtopiapath; | ||
206 | |||
207 | QString text = mEmailChannel->text(); | ||
208 | |||
209 | if (newClient == KABPrefs::OPIE) | ||
210 | { | ||
211 | if ( QFile::exists( opiepath + "/bin/opiemail" )) | ||
212 | text = "QPE/Application/opiemail"; | ||
213 | else | ||
214 | text = "FILENOTFOUND: " + opiepath + "/bin/opiemail"; | ||
215 | } | ||
216 | else if (newClient == KABPrefs::QTOPIA) | ||
217 | { | ||
218 | if ( QFile::exists( qtopiapath + "/bin/qtmail" )) | ||
219 | text = "QPE/Application/qtmail"; | ||
220 | else | ||
221 | text = "FILENOTFOUND: " + qtopiapath + "/bin/qtmail"; | ||
222 | 162 | ||
223 | } | ||
224 | else if (newClient == KABPrefs::OMPI) | ||
225 | { | ||
226 | if ( QFile::exists( qtopiapath + "/bin/ompi" )) | ||
227 | text = "QPE/Application/ompi"; | ||
228 | else if ( QFile::exists( opiepath + "/bin/ompi" )) | ||
229 | text = "QPE/Application/ompi"; | ||
230 | else | ||
231 | text = "FILENOTFOUND: " + qtopiapath + "/bin/ompi"; | ||
232 | |||
233 | } | ||
234 | else | ||
235 | { | ||
236 | //do nothing if we choosed other | ||
237 | } | ||
238 | |||
239 | mEmailChannel->setText( text ); | ||
240 | |||
241 | |||
242 | } | ||
243 | |||
244 | |||
245 | void KABConfigWidget::restoreSettings() | ||
246 | { | ||
247 | bool blocked = signalsBlocked(); | 163 | bool blocked = signalsBlocked(); |
@@ -249,7 +165,4 @@ void KABConfigWidget::restoreSettings() | |||
249 | 165 | ||
250 | mNameParsing->setChecked( KABPrefs::instance()->mAutomaticNameParsing ); | 166 | mNameParsing->setChecked( prefs->mAutomaticNameParsing ); |
251 | mViewsSingleClickBox->setChecked( KABPrefs::instance()->mHonorSingleClick ); | 167 | mViewsSingleClickBox->setChecked( prefs->mHonorSingleClick ); |
252 | |||
253 | mEmailChannel->setText( KABPrefs::instance()->mEmailChannel ); | ||
254 | mEmailClient->setCurrentItem(KABPrefs::instance()->mEmailClient); | ||
255 | 168 | ||
@@ -264,9 +177,6 @@ void KABConfigWidget::restoreSettings() | |||
264 | 177 | ||
265 | void KABConfigWidget::saveSettings() | 178 | void KABConfigWidget::saveSettings(KABPrefs* prefs) |
266 | { | 179 | { |
267 | KABPrefs::instance()->mAutomaticNameParsing = mNameParsing->isChecked(); | 180 | prefs->mAutomaticNameParsing = mNameParsing->isChecked(); |
268 | KABPrefs::instance()->mHonorSingleClick = mViewsSingleClickBox->isChecked(); | 181 | prefs->mHonorSingleClick = mViewsSingleClickBox->isChecked(); |
269 | |||
270 | KABPrefs::instance()->mEmailClient = mEmailClient->currentItem(); | ||
271 | KABPrefs::instance()->mEmailChannel = mEmailChannel->text(); | ||
272 | 182 | ||
@@ -280,3 +190,3 @@ void KABConfigWidget::saveSettings() | |||
280 | 190 | ||
281 | void KABConfigWidget::defaults() | 191 | void KABConfigWidget::defaults(KABPrefs* prefs) |
282 | { | 192 | { |
@@ -285,6 +195,2 @@ void KABConfigWidget::defaults() | |||
285 | 195 | ||
286 | mEmailClient->setCurrentItem(KABPrefs::OMPI); | ||
287 | emailclient_changed( KABPrefs::OMPI ); | ||
288 | |||
289 | |||
290 | emit changed( true ); | 196 | emit changed( true ); |
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index 9d1363b..8c0c436 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h | |||
@@ -34,2 +34,3 @@ class QLineEdit; | |||
34 | class KListView; | 34 | class KListView; |
35 | class KABPrefs; | ||
35 | 36 | ||
@@ -44,5 +45,5 @@ class KABConfigWidget : public QWidget | |||
44 | 45 | ||
45 | void restoreSettings(); | 46 | void restoreSettings(KABPrefs* prefs); |
46 | void saveSettings(); | 47 | void saveSettings(KABPrefs* prefs); |
47 | void defaults(); | 48 | void defaults(KABPrefs* prefs); |
48 | 49 | ||
@@ -60,3 +61,2 @@ class KABConfigWidget : public QWidget | |||
60 | void itemClicked( QListViewItem* ); | 61 | void itemClicked( QListViewItem* ); |
61 | void emailclient_changed( int newClient ); | ||
62 | 62 | ||
@@ -71,4 +71,2 @@ class KABConfigWidget : public QWidget | |||
71 | QPushButton *mConfigureButton; | 71 | QPushButton *mConfigureButton; |
72 | QComboBox* mEmailClient; | ||
73 | QLineEdit* mEmailChannel; | ||
74 | 72 | ||
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index a278042..26398f8 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp | |||
@@ -1,23 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
@@ -29,4 +29,4 @@ | |||
29 | #include <kdebug.h> | 29 | #include <kdebug.h> |
30 | #include <klocale.h> | 30 | //#include <klocale.h> |
31 | #include <stdlib.h> | 31 | //#include <stdlib.h> |
32 | 32 | ||
@@ -36,2 +36,5 @@ | |||
36 | 36 | ||
37 | #include "kabprefs.h" | ||
38 | #include "kprefs.h" | ||
39 | |||
37 | extern "C" | 40 | extern "C" |
@@ -52,20 +55,19 @@ KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name ) | |||
52 | layout->setMargin( 0 ); | 55 | layout->setMargin( 0 ); |
53 | 56 | ||
54 | connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); | 57 | connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); |
55 | load(); | ||
56 | } | 58 | } |
57 | 59 | ||
58 | void KCMKabConfig::load() | 60 | void KCMKabConfig::load(KPrefs* prefs) |
59 | { | 61 | { |
60 | mConfigWidget->restoreSettings(); | 62 | mConfigWidget->restoreSettings((KABPrefs*)prefs); |
61 | } | 63 | } |
62 | 64 | ||
63 | void KCMKabConfig::save() | 65 | void KCMKabConfig::save(KPrefs* prefs) |
64 | { | 66 | { |
65 | mConfigWidget->saveSettings(); | 67 | mConfigWidget->saveSettings((KABPrefs*)prefs); |
66 | } | 68 | } |
67 | 69 | ||
68 | void KCMKabConfig::defaults() | 70 | void KCMKabConfig::defaults(KPrefs* prefs) |
69 | { | 71 | { |
70 | mConfigWidget->defaults(); | 72 | mConfigWidget->defaults((KABPrefs*)prefs); |
71 | } | 73 | } |
@@ -83,3 +85,3 @@ const KAboutData* KCMKabConfig::aboutData() const | |||
83 | return about; | 85 | return about; |
84 | 86 | ||
85 | } | 87 | } |
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h index be345b8..b4858c1 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabconfig.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
@@ -29,6 +29,3 @@ | |||
29 | class KABConfigWidget; | 29 | class KABConfigWidget; |
30 | 30 | class KPrefs; | |
31 | #ifndef KAB_EMBEDDED | ||
32 | class KAboutData; | ||
33 | #endif //KAB_EMBEDDED | ||
34 | 31 | ||
@@ -41,8 +38,5 @@ class KCMKabConfig : public KCModule | |||
41 | 38 | ||
42 | virtual void load(); | 39 | virtual void load(KPrefs* prefs); |
43 | virtual void save(); | 40 | virtual void save(KPrefs* prefs); |
44 | virtual void defaults(); | 41 | virtual void defaults(KPrefs* prefs); |
45 | #ifndef KAB_EMBEDDED | ||
46 | virtual const KAboutData* aboutData() const; | ||
47 | #endif //KAB_EMBEDDED | ||
48 | 42 | ||