summaryrefslogtreecommitdiffabout
path: root/libkdepim
authorulf69 <ulf69>2004-09-16 17:23:08 (UTC)
committer ulf69 <ulf69>2004-09-16 17:23:08 (UTC)
commitc32d7e58ca69196426eee3217140227aca634f52 (patch) (unidiff)
tree3cc420da278d1035bb45c23d7c70562369f96b7b /libkdepim
parent02e7ae4983679a787834277176a031286a8310c2 (diff)
downloadkdepimpi-c32d7e58ca69196426eee3217140227aca634f52.zip
kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.gz
kdepimpi-c32d7e58ca69196426eee3217140227aca634f52.tar.bz2
added sip support to external apps
Diffstat (limited to 'libkdepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp44
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.h5
-rw-r--r--libkdepim/kpimglobalprefs.cpp7
-rw-r--r--libkdepim/kpimglobalprefs.h10
4 files changed, 63 insertions, 3 deletions
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 4f4cc6a..703aeb1 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -75,24 +75,25 @@ $Id$
75 75
76#include "kdepimconfigwidget.h" 76#include "kdepimconfigwidget.h"
77 77
78 78
79KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name ) 79KDEPIMConfigWidget::KDEPIMConfigWidget( QWidget *parent, const char *name )
80 : QWidget( parent, name ) 80 : QWidget( parent, name )
81{ 81{
82 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email")); 82 mExternalAppsMap.insert(ExternalAppHandler::EMAIL, i18n("Email"));
83 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone")); 83 mExternalAppsMap.insert(ExternalAppHandler::PHONE, i18n("Phone"));
84 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS")); 84 mExternalAppsMap.insert(ExternalAppHandler::SMS, i18n("SMS"));
85 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax")); 85 mExternalAppsMap.insert(ExternalAppHandler::FAX, i18n("Fax"));
86 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager")); 86 mExternalAppsMap.insert(ExternalAppHandler::PAGER, i18n("Pager"));
87 mExternalAppsMap.insert(ExternalAppHandler::SIP, i18n("SIP"));
87 88
88 89
89 QVBoxLayout *topLayout = new QVBoxLayout( this, 0, 90 QVBoxLayout *topLayout = new QVBoxLayout( this, 0,
90 KDialog::spacingHint() ); 91 KDialog::spacingHint() );
91 92
92 QTabWidget *tabWidget = new QTabWidget( this ); 93 QTabWidget *tabWidget = new QTabWidget( this );
93 topLayout->addWidget( tabWidget ); 94 topLayout->addWidget( tabWidget );
94 95
95 96
96 97
97 // mailclient page 98 // mailclient page
98 QWidget *externalAppsPage = new QWidget( this ); 99 QWidget *externalAppsPage = new QWidget( this );
@@ -190,24 +191,27 @@ void KDEPIMConfigWidget::externalapp_changed( int newApp )
190 case(ExternalAppHandler::PHONE): 191 case(ExternalAppHandler::PHONE):
191 mCurrentClient = mPhoneClient; 192 mCurrentClient = mPhoneClient;
192 break; 193 break;
193 case(ExternalAppHandler::SMS): 194 case(ExternalAppHandler::SMS):
194 mCurrentClient = mSMSClient; 195 mCurrentClient = mSMSClient;
195 break; 196 break;
196 case(ExternalAppHandler::FAX): 197 case(ExternalAppHandler::FAX):
197 mCurrentClient = mFaxClient; 198 mCurrentClient = mFaxClient;
198 break; 199 break;
199 case(ExternalAppHandler::PAGER): 200 case(ExternalAppHandler::PAGER):
200 mCurrentClient = mPagerClient; 201 mCurrentClient = mPagerClient;
201 break; 202 break;
203 case(ExternalAppHandler::SIP):
204 mCurrentClient = mSipClient;
205 break;
202 default: 206 default:
203 return; 207 return;
204 } 208 }
205 209
206 // and at last update the widgets 210 // and at last update the widgets
207 updateClientWidgets(); 211 updateClientWidgets();
208} 212}
209 213
210 214
211 215
212void KDEPIMConfigWidget::client_changed( int newClient ) 216void KDEPIMConfigWidget::client_changed( int newClient )
213{ 217{
@@ -238,24 +242,27 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
238 case(ExternalAppHandler::PHONE): 242 case(ExternalAppHandler::PHONE):
239 mPhoneClient= mClient->currentItem(); 243 mPhoneClient= mClient->currentItem();
240 break; 244 break;
241 case(ExternalAppHandler::SMS): 245 case(ExternalAppHandler::SMS):
242 mSMSClient = mClient->currentItem(); 246 mSMSClient = mClient->currentItem();
243 break; 247 break;
244 case(ExternalAppHandler::FAX): 248 case(ExternalAppHandler::FAX):
245 mFaxClient = mClient->currentItem(); 249 mFaxClient = mClient->currentItem();
246 break; 250 break;
247 case(ExternalAppHandler::PAGER): 251 case(ExternalAppHandler::PAGER):
248 mPagerClient = mClient->currentItem(); 252 mPagerClient = mClient->currentItem();
249 break; 253 break;
254 case(ExternalAppHandler::SIP):
255 mSipClient = mClient->currentItem();
256 break;
250 default: 257 default:
251 return; 258 return;
252 } 259 }
253 260
254 //store the current data back to the apropriate membervariables if we had set it to "other" 261 //store the current data back to the apropriate membervariables if we had set it to "other"
255 if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) 262 if ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
256 { 263 {
257 mEmailOtherChannel = mChannel->text(); 264 mEmailOtherChannel = mChannel->text();
258 mEmailOtherMessage = mMessage->text(); 265 mEmailOtherMessage = mMessage->text();
259 mEmailOtherMessageParameters = mParameters->text(); 266 mEmailOtherMessageParameters = mParameters->text();
260 mEmailOtherMessage2 = mMessage2->text(); 267 mEmailOtherMessage2 = mMessage2->text();
261 mEmailOtherMessageParameters2 = mParameters2->text(); 268 mEmailOtherMessageParameters2 = mParameters2->text();
@@ -275,24 +282,30 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
275 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 282 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
276 { 283 {
277 mFaxOtherChannel = mChannel->text(); 284 mFaxOtherChannel = mChannel->text();
278 mFaxOtherMessage = mMessage->text(); 285 mFaxOtherMessage = mMessage->text();
279 mFaxOtherMessageParameters = mParameters->text(); 286 mFaxOtherMessageParameters = mParameters->text();
280 } 287 }
281 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) 288 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
282 { 289 {
283 mPagerOtherChannel = mChannel->text(); 290 mPagerOtherChannel = mChannel->text();
284 mPagerOtherMessage = mMessage->text(); 291 mPagerOtherMessage = mMessage->text();
285 mPagerOtherMessageParameters = mParameters->text(); 292 mPagerOtherMessageParameters = mParameters->text();
286 } 293 }
294 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
295 {
296 mSipOtherChannel = mChannel->text();
297 mSipOtherMessage = mMessage->text();
298 mSipOtherMessageParameters = mParameters->text();
299 }
287 300
288 301
289} 302}
290 303
291void KDEPIMConfigWidget::updateClientWidgets() 304void KDEPIMConfigWidget::updateClientWidgets()
292{ 305{
293 bool blocked = signalsBlocked(); 306 bool blocked = signalsBlocked();
294 blockSignals( true ); 307 blockSignals( true );
295 308
296 // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display 309 // at this point we assume, that mCurrentApp and mCurrentClient are set to the values that we want to display
297 QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp ); 310 QMap<ExternalAppHandler::Types, QString>::Iterator it = mExternalAppsMap.find ( mCurrentApp );
298 if (it == mExternalAppsMap.end()) 311 if (it == mExternalAppsMap.end())
@@ -344,48 +357,56 @@ void KDEPIMConfigWidget::updateClientWidgets()
344 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 357 else if ((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
345 { 358 {
346 mChannel->setText(mFaxOtherChannel); 359 mChannel->setText(mFaxOtherChannel);
347 mMessage->setText(mFaxOtherMessage); 360 mMessage->setText(mFaxOtherMessage);
348 mParameters->setText(mFaxOtherMessageParameters); 361 mParameters->setText(mFaxOtherMessageParameters);
349 } 362 }
350 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC)) 363 else if ((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
351 { 364 {
352 mChannel->setText(mPagerOtherChannel); 365 mChannel->setText(mPagerOtherChannel);
353 mMessage->setText(mPagerOtherMessage); 366 mMessage->setText(mPagerOtherMessage);
354 mParameters->setText(mPagerOtherMessageParameters); 367 mParameters->setText(mPagerOtherMessageParameters);
355 } 368 }
369 else if ((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC))
370 {
371 mChannel->setText(mSipOtherChannel);
372 mMessage->setText(mSipOtherMessage);
373 mParameters->setText(mSipOtherMessageParameters);
374 }
356 } 375 }
357 376
358 } 377 }
359 378
360 bool readonly; 379 bool readonly;
361 bool enabled; 380 bool enabled;
362 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC)) 381 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::OTHER_EMC))
363 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC)) 382 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
364 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC)) 383 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::OTHER_SMC))
365 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC)) 384 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::OTHER_FAC))
366 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))) 385 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::OTHER_PAC))
386 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::OTHER_SIC)))
367 { 387 {
368 readonly = false; 388 readonly = false;
369 } 389 }
370 else 390 else
371 { 391 {
372 readonly = true; 392 readonly = true;
373 } 393 }
374 394
375 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC)) 395 if ( ((mCurrentApp == ExternalAppHandler::EMAIL) && (mCurrentClient == KPimGlobalPrefs::NONE_EMC))
376 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC)) 396 ||((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::NONE_PHC))
377 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC)) 397 ||((mCurrentApp == ExternalAppHandler::SMS) && (mCurrentClient == KPimGlobalPrefs::NONE_SMC))
378 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC)) 398 ||((mCurrentApp == ExternalAppHandler::FAX) && (mCurrentClient == KPimGlobalPrefs::NONE_FAC))
379 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))) 399 ||((mCurrentApp == ExternalAppHandler::PAGER) && (mCurrentClient == KPimGlobalPrefs::NONE_PAC))
400 ||((mCurrentApp == ExternalAppHandler::SIP) && (mCurrentClient == KPimGlobalPrefs::NONE_SIC)))
380 { 401 {
381 enabled = false; 402 enabled = false;
382 } 403 }
383 else 404 else
384 { 405 {
385 enabled = true; 406 enabled = true;
386 } 407 }
387 408
388 409
389 mChannel->setReadOnly(readonly); 410 mChannel->setReadOnly(readonly);
390 mMessage->setReadOnly(readonly); 411 mMessage->setReadOnly(readonly);
391 mParameters->setReadOnly(readonly); 412 mParameters->setReadOnly(readonly);
@@ -449,24 +470,29 @@ void KDEPIMConfigWidget::restoreSettings(KPimGlobalPrefs* prefs)
449 mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters; 470 mFaxOtherMessageParameters = prefs->mFaxOtherMessageParameters;
450 471
451 mSMSClient = prefs->mSMSClient; 472 mSMSClient = prefs->mSMSClient;
452 mSMSOtherChannel = prefs->mSMSOtherChannel; 473 mSMSOtherChannel = prefs->mSMSOtherChannel;
453 mSMSOtherMessage = prefs->mSMSOtherMessage; 474 mSMSOtherMessage = prefs->mSMSOtherMessage;
454 mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters; 475 mSMSOtherMessageParameters = prefs->mSMSOtherMessageParameters;
455 476
456 mPagerClient = prefs->mPagerClient; 477 mPagerClient = prefs->mPagerClient;
457 mPagerOtherChannel = prefs->mPagerOtherChannel; 478 mPagerOtherChannel = prefs->mPagerOtherChannel;
458 mPagerOtherMessage = prefs->mPagerOtherMessage; 479 mPagerOtherMessage = prefs->mPagerOtherMessage;
459 mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters; 480 mPagerOtherMessageParameters = prefs->mPagerOtherMessageParameters;
460 481
482 mSipClient = prefs->mPagerClient;
483 mSipOtherChannel = prefs->mSipOtherChannel;
484 mSipOtherMessage = prefs->mSipOtherMessage;
485 mSipOtherMessageParameters = prefs->mSipOtherMessageParameters;
486
461 mCurrentApp = ExternalAppHandler::EMAIL; 487 mCurrentApp = ExternalAppHandler::EMAIL;
462 mCurrentClient = mEmailClient; 488 mCurrentClient = mEmailClient;
463 489
464 updateClientWidgets(); 490 updateClientWidgets();
465 491
466 blockSignals( blocked ); 492 blockSignals( blocked );
467 493
468 emit changed( false ); 494 emit changed( false );
469 495
470} 496}
471 497
472void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs) 498void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs)
@@ -491,24 +517,30 @@ void KDEPIMConfigWidget::saveSettings(KPimGlobalPrefs* prefs)
491 prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters; 517 prefs->mFaxOtherMessageParameters = mFaxOtherMessageParameters;
492 518
493 prefs->mSMSClient = mSMSClient; 519 prefs->mSMSClient = mSMSClient;
494 prefs->mSMSOtherChannel = mSMSOtherChannel; 520 prefs->mSMSOtherChannel = mSMSOtherChannel;
495 prefs->mSMSOtherMessage = mSMSOtherMessage; 521 prefs->mSMSOtherMessage = mSMSOtherMessage;
496 prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters; 522 prefs->mSMSOtherMessageParameters = mSMSOtherMessageParameters;
497 523
498 prefs->mPagerClient = mPagerClient; 524 prefs->mPagerClient = mPagerClient;
499 prefs->mPagerOtherChannel = mPagerOtherChannel; 525 prefs->mPagerOtherChannel = mPagerOtherChannel;
500 prefs->mPagerOtherMessage = mPagerOtherMessage; 526 prefs->mPagerOtherMessage = mPagerOtherMessage;
501 prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters; 527 prefs->mPagerOtherMessageParameters = mPagerOtherMessageParameters;
502 528
529
530 prefs->mSipClient = mSipClient;
531 prefs->mSipOtherChannel = mSipOtherChannel;
532 prefs->mSipOtherMessage = mSipOtherMessage;
533 prefs->mSipOtherMessageParameters = mSipOtherMessageParameters;
534
503 prefs->writeConfig(); 535 prefs->writeConfig();
504 536
505 //release the cache that other views can access the changed values instantanious 537 //release the cache that other views can access the changed values instantanious
506 ExternalAppHandler::instance()->loadConfig(); 538 ExternalAppHandler::instance()->loadConfig();
507 539
508 emit changed( false ); 540 emit changed( false );
509} 541}
510 542
511void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs) 543void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs)
512{ 544{
513 545
514 DefaultAppItem* dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC); 546 DefaultAppItem* dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC);
@@ -541,24 +573,32 @@ void KDEPIMConfigWidget::defaults(KPimGlobalPrefs* prefs)
541 mSMSOtherChannel = dai->_channel; 573 mSMSOtherChannel = dai->_channel;
542 mSMSOtherMessage = dai->_message; 574 mSMSOtherMessage = dai->_message;
543 mSMSOtherMessageParameters = dai->_parameters; 575 mSMSOtherMessageParameters = dai->_parameters;
544 576
545 dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC); 577 dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC);
546 578
547 mPagerClient = dai->_id; 579 mPagerClient = dai->_id;
548 mPagerOtherChannel = dai->_channel; 580 mPagerOtherChannel = dai->_channel;
549 mPagerOtherMessage = dai->_message; 581 mPagerOtherMessage = dai->_message;
550 mPagerOtherMessageParameters = dai->_parameters; 582 mPagerOtherMessageParameters = dai->_parameters;
551 583
552 584
585 dai = ExternalAppHandler::instance()->getDefaultItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC);
586
587 mSipClient = dai->_id;
588 mSipOtherChannel = dai->_channel;
589 mSipOtherMessage = dai->_message;
590 mSipOtherMessageParameters = dai->_parameters;
591
592
553 emit changed( true ); 593 emit changed( true );
554} 594}
555 595
556void KDEPIMConfigWidget::modified() 596void KDEPIMConfigWidget::modified()
557{ 597{
558 emit changed( true ); 598 emit changed( true );
559} 599}
560 600
561void KDEPIMConfigWidget::textChanged( const QString& text ) 601void KDEPIMConfigWidget::textChanged( const QString& text )
562{ 602{
563 emit changed( true ); 603 emit changed( true );
564} 604}
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.h b/libkdepim/kcmconfigs/kdepimconfigwidget.h
index 6e02544..e3cfd81 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.h
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.h
@@ -121,20 +121,25 @@ class KDEPIMConfigWidget : public QWidget
121 QString mFaxOtherMessageParameters; 121 QString mFaxOtherMessageParameters;
122 122
123 int mSMSClient; 123 int mSMSClient;
124 QString mSMSOtherChannel; 124 QString mSMSOtherChannel;
125 QString mSMSOtherMessage; 125 QString mSMSOtherMessage;
126 QString mSMSOtherMessageParameters; 126 QString mSMSOtherMessageParameters;
127 127
128 int mPagerClient; 128 int mPagerClient;
129 QString mPagerOtherChannel; 129 QString mPagerOtherChannel;
130 QString mPagerOtherMessage; 130 QString mPagerOtherMessage;
131 QString mPagerOtherMessageParameters; 131 QString mPagerOtherMessageParameters;
132 132
133 int mSipClient;
134 QString mSipOtherChannel;
135 QString mSipOtherMessage;
136 QString mSipOtherMessageParameters;
137
133 138
134 139
135 QMap<ExternalAppHandler::Types, QString> mExternalAppsMap; 140 QMap<ExternalAppHandler::Types, QString> mExternalAppsMap;
136 141
137// AddresseeWidget *mAddresseeWidget; 142// AddresseeWidget *mAddresseeWidget;
138}; 143};
139 144
140#endif 145#endif
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 7f683a8..eb8f1de 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -32,25 +32,25 @@ $Id$
32#include <kconfig.h> 32#include <kconfig.h>
33#include <klocale.h> 33#include <klocale.h>
34#include <kdebug.h> 34#include <kdebug.h>
35#include <kstaticdeleter.h> 35#include <kstaticdeleter.h>
36 36
37#include "kpimglobalprefs.h" 37#include "kpimglobalprefs.h"
38 38
39KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0; 39KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
40static KStaticDeleter<KPimGlobalPrefs> staticDeleter; 40static KStaticDeleter<KPimGlobalPrefs> staticDeleter;
41 41
42 42
43KPimGlobalPrefs::KPimGlobalPrefs( const QString &name ) 43KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
44 : KPrefs("kkdepimrc") 44 : KPrefs("microkdeglobalrc")
45{ 45{
46 KPrefs::setCurrentGroup( "ExternalApplications" ); 46 KPrefs::setCurrentGroup( "ExternalApplications" );
47 47
48 addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC ); 48 addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC );
49 addItemString( "EmailChannel", &mEmailOtherChannel, "" ); 49 addItemString( "EmailChannel", &mEmailOtherChannel, "" );
50 addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" ); 50 addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" );
51 addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" ); 51 addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" );
52 addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" ); 52 addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" );
53 addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" ); 53 addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" );
54 54
55 addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC ); 55 addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC );
56 addItemString( "PhoneChannel", &mPhoneOtherChannel, "" ); 56 addItemString( "PhoneChannel", &mPhoneOtherChannel, "" );
@@ -63,24 +63,29 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
63 addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" ); 63 addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" );
64 64
65 addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC ); 65 addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC );
66 addItemString( "SMSChannel", &mSMSOtherChannel, "" ); 66 addItemString( "SMSChannel", &mSMSOtherChannel, "" );
67 addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" ); 67 addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" );
68 addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" ); 68 addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" );
69 69
70 addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC ); 70 addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC );
71 addItemString( "PagerChannel", &mPagerOtherChannel, "" ); 71 addItemString( "PagerChannel", &mPagerOtherChannel, "" );
72 addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" ); 72 addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" );
73 addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" ); 73 addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" );
74 74
75 addItemInt( "SIPChannelType", &mSipClient, NONE_SIC );
76 addItemString( "SIPChannel", &mSipOtherChannel, "" );
77 addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
78 addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
79
75} 80}
76 81
77KPimGlobalPrefs::~KPimGlobalPrefs() 82KPimGlobalPrefs::~KPimGlobalPrefs()
78{ 83{
79} 84}
80 85
81KPimGlobalPrefs *KPimGlobalPrefs::instance() 86KPimGlobalPrefs *KPimGlobalPrefs::instance()
82{ 87{
83 if ( !sInstance ) { 88 if ( !sInstance ) {
84 sInstance = staticDeleter.setObject( new KPimGlobalPrefs() ); 89 sInstance = staticDeleter.setObject( new KPimGlobalPrefs() );
85 sInstance->readConfig(); 90 sInstance->readConfig();
86 } 91 }
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index 80b2c4f..8bd543d 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -63,24 +63,29 @@ class KPimGlobalPrefs : public KPrefs
63 }; 63 };
64 64
65 enum SMSClients { 65 enum SMSClients {
66 NONE_SMC = 0, 66 NONE_SMC = 0,
67 OTHER_SMC = 1 67 OTHER_SMC = 1
68 }; 68 };
69 69
70 enum PagerClients { 70 enum PagerClients {
71 NONE_PAC = 0, 71 NONE_PAC = 0,
72 OTHER_PAC = 1 72 OTHER_PAC = 1
73 }; 73 };
74 74
75 enum SIPClients {
76 NONE_SIC = 0,
77 OTHER_SIC = 1
78 };
79
75 private: 80 private:
76 KPimGlobalPrefs( const QString &name = QString::null ); 81 KPimGlobalPrefs( const QString &name = QString::null );
77 82
78 static KPimGlobalPrefs *sInstance; 83 static KPimGlobalPrefs *sInstance;
79 84
80 85
81 public: 86 public:
82 int mEmailClient; 87 int mEmailClient;
83 QString mEmailOtherChannel; 88 QString mEmailOtherChannel;
84 QString mEmailOtherMessage; 89 QString mEmailOtherMessage;
85 QString mEmailOtherMessageParameters; 90 QString mEmailOtherMessageParameters;
86 QString mEmailOtherMessage2; 91 QString mEmailOtherMessage2;
@@ -97,16 +102,21 @@ class KPimGlobalPrefs : public KPrefs
97 QString mFaxOtherMessageParameters; 102 QString mFaxOtherMessageParameters;
98 103
99 int mSMSClient; 104 int mSMSClient;
100 QString mSMSOtherChannel; 105 QString mSMSOtherChannel;
101 QString mSMSOtherMessage; 106 QString mSMSOtherMessage;
102 QString mSMSOtherMessageParameters; 107 QString mSMSOtherMessageParameters;
103 108
104 int mPagerClient; 109 int mPagerClient;
105 QString mPagerOtherChannel; 110 QString mPagerOtherChannel;
106 QString mPagerOtherMessage; 111 QString mPagerOtherMessage;
107 QString mPagerOtherMessageParameters; 112 QString mPagerOtherMessageParameters;
108 113
114 int mSipClient;
115 QString mSipOtherChannel;
116 QString mSipOtherMessage;
117 QString mSipOtherMessageParameters;
118
109 119
110}; 120};
111 121
112#endif 122#endif